删除选项及system.out去掉

src/main/java/com/baidu/ueditor/ConfigManager.java

@@ -239,7 +239,6 @@ public final class ConfigManager {
 				reader.close();
 				
 				String path = this.getConfigPath();
-				System.out.println("updatePath:"+path);
 				String newContent = builder.toString();
 				if("local".equals(DiaowenProperty.DWSTORAGETYPE)){
 //					newContent = newContent.replaceAll( "http://file.diaowen.net", DiaowenProperty.STORAGE_URL_PREFIX);
@@ -248,10 +247,8 @@ public final class ConfigManager {
 				}else{
 					newContent = newContent.replaceAll( "http://file.diaowen.net/", DiaowenProperty.STORAGE_URL_PREFIX);
 				}
-				System.out.println(DiaowenProperty.STORAGE_URL_PREFIX);
 				// "imageUrlPrefix": "http://file.diaowen.net/", /* 图片访问路径前缀 */
 //				String newContent = newContent.replaceAll( "http://file.diaowen.net", DiaowenProperty.STORAGE_URL_PREFIX);
-				System.out.println(newContent);
 				OutputStreamWriter writer = new OutputStreamWriter(new FileOutputStream(path), "UTF-8");
 				writer.write(newContent);
 				writer.close();

src/main/java/com/baidu/ueditor/hunter/FileManager.java

@@ -39,8 +39,7 @@ public class FileManager {
 		
 		if("local".equals(DiaowenProperty.DWSTORAGETYPE)) {
 			File dir = new File( this.rootPath + this.dir );
-			
-			System.out.println("dir:"+this.rootPath + this.dir);
+
 			State state = null;
 
 			if ( !dir.exists() ) {
@@ -52,10 +51,7 @@ public class FileManager {
 			}
 			
 			Collection<File> list = FileUtils.listFiles( dir, this.allowFiles, true );
-			
-			for (File file : list) {
-				System.out.println(file.getName());
-			}
+
 			if ( index < 0 || index > list.size() ) {
 				state = new MultiState( true );
 			} else {

src/main/java/com/key/common/base/action/CrudActionSupport.java

@@ -83,7 +83,6 @@ public abstract class CrudActionSupport<T extends IdEntity,ID extends Serializab
 	 * 在input()前执行二次绑定.
 	 */
 	public void prepareInput() throws Exception {
-		System.out.println("二次绑定....");
 		prepareModel();
 	}
 

src/main/java/com/key/common/base/action/UploadAction.java

@@ -207,7 +207,6 @@ public class UploadAction extends ActionSupport{
 						fileName.append(str[pos]);
 					}
 					fileName.append(filenames[i].substring(filenames[i].lastIndexOf(".")));
-					System.out.println("path:"+path);
 					
 					if("aliyunOSS".equals(DiaowenProperty.DWSTORAGETYPE)){
 						//保存到aliyun

src/main/java/com/key/common/dao/HibernateDao.java

@@ -54,12 +54,10 @@ public class HibernateDao<T, ID extends Serializable> extends SimpleHibernateDao
 	 */
 	public HibernateDao() {
 		super();
-		System.out.println("null super");
 	}
 
 	public HibernateDao(Class<T> entityClass) {
 		super(entityClass);
-		System.out.println(entityClass.getName());
 	}
 
 	//-- 分页查询函数 --//
@@ -155,10 +153,8 @@ public class HibernateDao<T, ID extends Serializable> extends SimpleHibernateDao
 		Page<T> page = new Page<T>(pageRequest);
 
 		Criteria c = createCriteria(criterions);
-		System.out.println("pageRequest.isCountTotal():"+pageRequest.isCountTotal());
 		if (pageRequest.isCountTotal()) {
 			long totalCount = countCriteriaResult(c);
-			System.out.println("totalCount:"+totalCount);
 			page.setTotalItems(totalCount);
 			pageRequest.setTotalPage(page.getTotalPage());
 		}
@@ -281,7 +277,6 @@ public class HibernateDao<T, ID extends Serializable> extends SimpleHibernateDao
 		// 先把Projection、ResultTransformer、OrderBy取出来,清空三者后再执行Count操作
 		Projection projection = impl.getProjection();
 		ResultTransformer transformer = impl.getResultTransformer();
-		System.out.println("count 查询"+impl.getEntityOrClassName());
 		List<CriteriaImpl.OrderEntry> orderEntries = null;
 		try {
 			orderEntries = (List) ReflectionUtils.getFieldValue(impl, "orderEntries");
@@ -338,7 +333,6 @@ public class HibernateDao<T, ID extends Serializable> extends SimpleHibernateDao
 	@Override
 	public Page<T> findPage(final PageRequest pageRequest, final List<PropertyFilter> filters) {
 		Criterion[] criterions = buildCriterionByPropertyFilter(filters);
-		System.out.println("findpage filters");
 		return findPage(pageRequest, criterions);
 	}
 
@@ -513,7 +507,6 @@ public class HibernateDao<T, ID extends Serializable> extends SimpleHibernateDao
 		Page<T> page = new Page<T>(pageRequest);
 		if (pageRequest.isCountTotal()) {
 			long totalCount = countCriteriaResult(c);
-			System.out.println("totalCount:"+totalCount);
 			page.setTotalItems(totalCount);
 			pageRequest.setTotalPage(page.getTotalPage());
 		}
@@ -533,7 +526,6 @@ public class HibernateDao<T, ID extends Serializable> extends SimpleHibernateDao
 		Page<T> page = new Page<T>(pageRequest);
 		if (pageRequest.isCountTotal()) {
 			long totalCount = countCriteriaResult(c);
-			System.out.println("totalCount:"+totalCount);
 			page.setTotalItems(totalCount);
 			pageRequest.setTotalPage(page.getTotalPage());
 		}

src/main/java/com/key/common/plugs/aliyun/AliyunOSS.java

@@ -64,9 +64,6 @@ public class AliyunOSS {
 		String key = fileName;
 		PutObjectResult result = client.putObject(bucketName, key, content,
 				meta);
-		System.out.println(key);
-		// 打印ETag
-		System.out.println(result.getETag());
 		content.close();
 	}
 
@@ -91,9 +88,6 @@ public class AliyunOSS {
 		String key = fileName;
 		PutObjectResult result = client.putObject(bucketName, key, content,
 				meta);
-		System.out.println(key);
-		// 打印ETag
-		System.out.println(result.getETag());
 	}
 
 	public static InputStream getObject(String bucketName, String fileName) {
@@ -110,7 +104,6 @@ public class AliyunOSS {
 
 	public static List<OSSObjectSummary> getObjectList(String bucketName,
 			String prefix, int endIndex, int maxKeys) {
-		System.out.println(prefix);
 		// 初始化OSSClient
 		OSSClient client = getOSSClient();
 
@@ -136,7 +129,6 @@ public class AliyunOSS {
 			nextMarker = listing.getNextMarker();
 		}
 
-		System.out.println("nextMarker:" + nextMarker);
 		// 遍历所有Object
 		List<OSSObjectSummary> objectSummarys = listing.getObjectSummaries();
 

src/main/java/com/key/common/plugs/baiduyun/BaiduBOS.java

@@ -61,9 +61,6 @@ public class BaiduBOS {
 		// 上传Object.
 		String objectKey=fileName;
 		PutObjectResponse result = client.putObject(bucketName, objectKey, content, meta);
-		System.out.println(objectKey);
-		// 打印ETag
-		System.out.println(result.getETag());
 		content.close();
 	}
 	
@@ -86,9 +83,6 @@ public class BaiduBOS {
 		// 上传Object.
 		String key=fileName;
 		PutObjectResponse result = client.putObject(bucketName, key, content, meta);
-		System.out.println(key);
-		// 打印ETag
-		System.out.println(result.getETag());
 	}
 	
 	
@@ -108,7 +102,6 @@ public class BaiduBOS {
 	public static List<BosObjectSummary> getObjectList(String bucketName,String prefix,int endIndex,int maxKeys){
 		
 
-		System.out.println(prefix);
 		// 初始化OSSClient
 		BosClient client = getClient();
 
@@ -136,7 +129,6 @@ public class BaiduBOS {
 			nextMarker = listing.getNextMarker();
 		}
 
-		System.out.println("nextMarker:" + nextMarker);
 		// 遍历所有Object
 		List<BosObjectSummary> objectSummarys = listing.getContents();
 		

src/main/java/com/key/common/plugs/data/mysql/MySQLDatabaseBackup.java

@@ -36,7 +36,6 @@ public class MySQLDatabaseBackup {
 		stringBuilder.append(" --user=").append(userName) .append(" --password=").append(password).append(" --lock-all-tables=true");
 		stringBuilder.append(" --result-file=").append(savePath + fileName).append(" --default-character-set=utf8 ").append(databaseName);
 		try {
-			System.out.println(stringBuilder.toString());
 			Process process = Runtime.getRuntime().exec(stringBuilder.toString());
 			if (process.waitFor() == 0) {// 0 表示线程正常终止。
 				return true;

src/main/java/com/key/common/plugs/itextpdf/PDFUtil.java

@@ -50,7 +50,6 @@ public class PDFUtil {
 
 		renderer.createPDF(os);
 
-		System.out.println("转换成功！");
 		os.flush();
 		os.close();
 		return new File(outputFile);
@@ -93,7 +92,6 @@ public class PDFUtil {
 		while ((temp = in.readLine()) != null) {
 			sb.append(temp);
 		}
-		System.out.println(sb.toString());
 		return sb.toString();
 	}
 }

src/main/java/com/key/dwsurvey/action/MySurveyAnswerAction.java

@@ -118,15 +118,12 @@ public class MySurveyAnswerAction extends ActionSupport{
 		HttpServletRequest request=Struts2Utils.getRequest();
 		HttpServletResponse response=Struts2Utils.getResponse();
 		try{
-			System.out.println("导出");
-			System.out.println("surveyId:"+surveyId);
 			String savePath = request.getSession().getServletContext().getRealPath("/");
 			User user=accountManager.getCurUser();
 	    	if(user!=null){
 	    		SurveyDirectory survey=directoryManager.getSurveyByUser(surveyId, user.getId());
 	    		if(survey!=null){
 	    			savePath=surveyAnswerManager.exportXLS(surveyId,savePath);
-	    			System.out.println("path:"+savePath);
 //	    			request.setAttribute("downPath", savePath);
 	    			response.sendRedirect(request.getContextPath()+savePath);
 	    		}

src/main/java/com/key/dwsurvey/action/QuCheckboxAction.java

@@ -156,7 +156,6 @@ public class QuCheckboxAction extends ActionSupport{
 			quLogic.setLogicType(logicType);
 			quLogics.add(quLogic);
 
-			System.out.println("visibility:"+visibility);
 		}
 		entity.setQuestionLogics(quLogics);
 		
@@ -197,7 +196,6 @@ public class QuCheckboxAction extends ActionSupport{
 			strBuf.replace(strLen-1, strLen, "");
 		}
 		strBuf.append("]}");
-		System.out.println(strBuf.toString());
 		return strBuf.toString();
 	}
 	

src/main/java/com/key/dwsurvey/action/SysPropertyAction.java

@@ -44,7 +44,6 @@ public class SysPropertyAction extends ActionSupport{
 		HttpServletRequest request = Struts2Utils.getRequest();
 		
 		String fileName="site.properties";
-		System.out.println("site.properties："+fileName);
 		ServletContext sc = Struts2Utils.getSession().getServletContext();
 		String filePath = "/WEB-INF/classes/conf/site/".replace("/", File.separator);
 		String fileRealPath = sc.getRealPath("/")+filePath+fileName;
@@ -144,7 +143,6 @@ public class SysPropertyAction extends ActionSupport{
 			if (!file.exists()) {
 				file.createNewFile();
 			}
-			System.out.println("生成indexSurvey.JSP：" + fileRealPath);
 			fw = new OutputStreamWriter(new FileOutputStream(file), "UTF-8");
 			fw.write("<%@ page language=\"java\" contentType=\"text/html; charset=UTF-8\" pageEncoding=\"UTF-8\" %>");
 			fw.write(data);

src/main/java/com/key/dwsurvey/action/nologin/ReportAction.java

@@ -52,8 +52,7 @@ public class ReportAction extends ActionSupport{
 //		directory=directoryManager.getSurvey(surveyId);
 		directory=directoryManager.getSurveyBySid(sid);
 		Integer viewAnswer=directory.getViewAnswer();
-		
-		System.out.println("viewAnswer:"+viewAnswer);
+
 		if(viewAnswer!=null && viewAnswer.intValue()==1){
 			List<Question> questions = surveyStatsManager.findFrequency(directory);
 			surveyStats.setQuestions(questions);

src/main/java/com/key/dwsurvey/action/nologin/ResponseAction.java

@@ -149,7 +149,6 @@ public class ResponseAction extends ActionSupport {
 				request.setAttribute("msg", "rule2");// 表示私有问卷
 				return RELOAD_ANSER_ERROR;
 			} else if (3 == rule) {// 令牌
-				System.out.println("---");
 				String ruleCode = request.getParameter("ruleCode");
 				String surveyRuleCode = surveyDetail.getRuleCode();
 				if (ruleCode == null || !ruleCode.equals(surveyRuleCode)) {
@@ -174,7 +173,6 @@ public class ResponseAction extends ActionSupport {
 
 			} else if ("aliyunOSS".equals(DiaowenProperty.DWSTORAGETYPE)
 					|| "baiduBOS".equals(DiaowenProperty.DWSTORAGETYPE)) {
-				System.out.println("				  //这句话的意思，是让浏览器用utf8来解析返回的数据  ");
 				// 这句话的意思，是让浏览器用utf8来解析返回的数据
 				response.setHeader("Content-type", "text/html;charset=UTF-8");
 				// 这句话的意思，是告诉servlet用UTF-8转码，而不是用默认的ISO8859
@@ -251,13 +249,11 @@ public class ResponseAction extends ActionSupport {
 			if ((effective != null && effective > 1 && cookie != null)
 					|| (effectiveIp != null && effectiveIp == 1 && ipNum > 0)) {
 				// 已经回答过
-				System.out.println("已经回答过");
 				return RELOAD_ANSER_ERROR;
 			}
 
 			if (ipNum >= refreshNum) {
 				String code = request.getParameter("jcaptchaInput");
-				System.out.println("启用验证码");
 				if (imageCaptchaService.validateResponseForID(request
 						.getSession().getId(), code)) {
 					// 验证通过
@@ -277,7 +273,6 @@ public class ResponseAction extends ActionSupport {
 			entity.setAddr(addr);
 			entity.setCity(city);
 			entity.setSurveyId(surveyId);
-			System.out.println(ipAddr + ":" + addr + ":" + city);
 			// 得到 MAC
 			// 保存数据
 			entity.setDataSource(0);// 表示网调来源
@@ -302,10 +297,8 @@ public class ResponseAction extends ActionSupport {
 		try {
 			String ipAddr = ipService.getIp(request);
 			long ipNum = surveyAnswerManager.getCountByIp(surveyId, ipAddr);
-			System.out.println(surveyId);
 			SurveyDirectory directory = directoryManager.getSurvey(surveyId);
 			SurveyDetail surveyDetail = directory.getSurveyDetail();
-			System.out.println(surveyDetail + ":");
 			int refreshNum = surveyDetail.getRefreshNum();
 			User user = accountManager.getCurUser();
 
@@ -321,13 +314,11 @@ public class ResponseAction extends ActionSupport {
 			if ((effective != null && effective > 1 && cookie != null)
 					|| (effectiveIp != null && effectiveIp == 1 && ipNum > 0)) {
 				// 已经回答过
-				System.out.println("已经回答过");
 				return RELOAD_ANSER_ERROR_M;
 			}
 
 			if (ipNum >= refreshNum) {
 				String code = request.getParameter("jcaptchaInput");
-				System.out.println("启用验证码");
 				if (imageCaptchaService.validateResponseForID(request
 						.getSession().getId(), code)) {
 					// 验证通过
@@ -424,7 +415,6 @@ public class ResponseAction extends ActionSupport {
 			anRadio.setQuItemId(quItemId);
 			anRadio.setOtherText(otherText);
 
-			System.out.println(key + "...." + otherText);
 			compRadioMaps.put(key, anRadio);
 		}
 		quMaps.put("compRadioMaps", compRadioMaps);
@@ -519,7 +509,6 @@ public class ResponseAction extends ActionSupport {
 			}
 			chenScoreMaps.put(key, map);
 		}
-		System.out.println("chenScoreMaps:" + chenScoreMaps);
 		quMaps.put("chenScoreMaps", chenScoreMaps);
 		// 矩阵填空题
 		Map<String, Object> chenFbkMaps = WebUtils.getParametersStartingWith(
@@ -558,10 +547,6 @@ public class ResponseAction extends ActionSupport {
 		}
 		quMaps.put("compChenRadioMaps", chenCompChenRadioMaps);
 
-		System.out.println("quMaps....");
-		for (String key : quMaps.keySet()) {
-			System.out.println("key:" + key + "," + quMaps.get(key));
-		}
 		return quMaps;
 	}
 
@@ -627,7 +612,6 @@ public class ResponseAction extends ActionSupport {
 			int effective = surveyDetail.getEffective();
 			int rule = surveyDetail.getRule();
 
-			System.out.println("rule:" + rule);
 			request.setAttribute("directory", directory);
 
 			// 调查规则

src/main/java/com/key/dwsurvey/action/nologin/SurveyAction.java

@@ -76,7 +76,6 @@ public class SurveyAction extends ActionSupport{
 	public String execute() throws Exception {
 		HttpServletRequest request=Struts2Utils.getRequest();
 		HttpServletResponse response=Struts2Utils.getResponse();
-		System.out.println("sid:"+sid);
 //		SurveyDirectory surveyDirectory=surveyDirectoryManager.getSurveyBySid(sid);
 //		surveyId=surveyDirectory.getId();
 //		//收集规则处理
@@ -132,7 +131,6 @@ public class SurveyAction extends ActionSupport{
 
 	    	String encoderContent=baseUrl+"/survey!answerSurveryMobile.action?surveyId="+surveyId;
 //	    	String encoderContent="http://192.168.0.101:8080/survey!answerSurveryMobile.action?surveyId="+surveyId;
-	    	System.out.println(encoderContent);
 	    	ByteArrayOutputStream jpegOutputStream = new ByteArrayOutputStream();  
 	    	BufferedImage twoDimensionImg = new TwoDimensionCode().qRCodeCommon(encoderContent, "jpg", 7);
 //	    	JPEGImageEncoder jpegEncoder = JPEGCodec.createJPEGEncoder(jpegOutputStream);

src/main/java/com/key/dwsurvey/dao/impl/AnCheckboxDaoImpl.java

@@ -115,8 +115,7 @@ public class AnCheckboxDaoImpl extends BaseDaoImpl<AnCheckbox, String> implement
 			columnSql=" t1.qu_item_id as quItemId1, t2.qu_item_id as quItemId2 ";
 			groupSql=" t1.qu_item_id,t2.qu_item_id ";
 			sql="select "+columnSql+",count(*) from "+rowTab+","+colTab+whereSql+groupSql;
-			
-			System.out.println(sql+":"+rowQuestion.getId()+","+colQuestion.getId());
+
 			List<Object[]> objects=session.createSQLQuery(sql).setParameter(0, rowQuestion.getId()).setParameter(1, colQuestion.getId()).list();
 			
 			List<QuRadio> quRadios=colQuestion.getQuRadios();
@@ -153,8 +152,7 @@ public class AnCheckboxDaoImpl extends BaseDaoImpl<AnCheckbox, String> implement
 			columnSql=" t1.qu_item_id as quItemId1, t2.qu_item_id as quItemId2 ";
 			groupSql=" t1.qu_item_id,t2.qu_item_id ";
 			sql="select "+columnSql+",count(*) from "+rowTab+","+colTab+whereSql+groupSql;
-			
-			System.out.println(sql+":"+rowQuestion.getId()+","+colQuestion.getId());
+
 			List<Object[]> objects=session.createSQLQuery(sql).setParameter(0, rowQuestion.getId()).setParameter(1, colQuestion.getId()).list();
 			
 			List<QuCheckbox> quCheckboxs=colQuestion.getQuCheckboxs();

src/main/java/com/key/dwsurvey/dao/impl/AnRadioDaoImpl.java

@@ -53,7 +53,6 @@ public class AnRadioDaoImpl extends BaseDaoImpl<AnRadio, String> implements AnRa
                                               Question colQuestion) {
 		List<DataCross> dataCrosses=new ArrayList<DataCross>();
 		List<QuRadio> rowList=rowQuestion.getQuRadios();
-		System.out.println("rowList.size():"+rowList.size());
 		
 		Session session=this.getSession();
 		
@@ -108,8 +107,7 @@ public class AnRadioDaoImpl extends BaseDaoImpl<AnRadio, String> implements AnRa
 			columnSql=" t1.qu_item_id as quItemId1, t2.qu_item_id as quItemId2 ";
 			groupSql=" t1.qu_item_id,t2.qu_item_id ";
 			sql="select "+columnSql+",count(*) from "+rowTab+","+colTab+whereSql+groupSql;
-			
-			System.out.println(sql+":"+rowQuestion.getId()+","+colQuestion.getId());
+
 			List<Object[]> objects=session.createSQLQuery(sql).setParameter(0, rowQuestion.getId()).setParameter(1, colQuestion.getId()).list();
 			
 			List<QuRadio> quRadios=colQuestion.getQuRadios();
@@ -145,8 +143,7 @@ public class AnRadioDaoImpl extends BaseDaoImpl<AnRadio, String> implements AnRa
 			columnSql=" t1.qu_item_id as quItemId1, t2.qu_item_id as quItemId2 ";
 			groupSql=" t1.qu_item_id, t2.qu_item_id ";
 			sql="select "+columnSql+",count(*) from "+rowTab+","+colTab+whereSql+groupSql;
-			
-			System.out.println(sql+":"+rowQuestion.getId()+","+colQuestion.getId());
+
 			List<Object[]> objects=session.createSQLQuery(sql).setParameter(0, rowQuestion.getId()).setParameter(1, colQuestion.getId()).list();
 			
 			List<QuCheckbox> quCheckboxs=colQuestion.getQuCheckboxs();

src/main/java/com/key/dwsurvey/dao/impl/AnYesnoDaoImpl.java

@@ -126,8 +126,7 @@ public class AnYesnoDaoImpl extends BaseDaoImpl<AnYesno, String> implements AnYe
 			colTab=" t_an_radio t2 ";
 			groupSql=" t1.yesno_answer,t2.qu_item_id ";
 			sql="select "+groupSql+",count(*) from "+rowTab+","+colTab+whereSql+groupSql;
-			
-			System.out.println(sql+":"+rowQuestion.getId()+","+colQuestion.getId());
+
 			List<Object[]> objects=session.createSQLQuery(sql).setParameter(0, rowQuestion.getId()).setParameter(1, colQuestion.getId()).list();
 			
 			List<QuRadio> quRadios=colQuestion.getQuRadios();
@@ -169,8 +168,7 @@ public class AnYesnoDaoImpl extends BaseDaoImpl<AnYesno, String> implements AnYe
 			colTab=" t_an_checkbox t2 ";
 			groupSql=" t1.yesno_answer,t2.qu_item_id ";
 			sql="select "+groupSql+",count(*) from "+rowTab+","+colTab+whereSql+groupSql;
-			
-			System.out.println(sql+":"+rowQuestion.getId()+","+colQuestion.getId());
+
 			List<Object[]> objects=session.createSQLQuery(sql).setParameter(0, rowQuestion.getId()).setParameter(1, colQuestion.getId()).list();
 			
 			List<QuCheckbox> quCheckboxs=colQuestion.getQuCheckboxs();

src/main/java/com/key/dwsurvey/dao/impl/QuRadioDaoImpl.java

@@ -23,7 +23,6 @@ public class QuRadioDaoImpl extends BaseDaoImpl<QuRadio, String> implements QuRa
 		if(quId!=null && !"".equals(quId)){
 			String sql="update t_qu_radio set order_by_id=order_by_id-1 where qu_id=? and order_by_id>=?";
 			//更新排序号
-			System.out.println(sql+","+quId+","+orderById);
 			SQLQuery query=this.getSession().createSQLQuery(sql);
 			query.setString(0, quId);
 			query.setInteger(1, orderById);

src/main/java/com/key/dwsurvey/dao/impl/QuestionDaoImpl.java

@@ -50,8 +50,6 @@ public class QuestionDaoImpl extends BaseDaoImpl<Question, String> implements Qu
 	}
 	
 	public void update(Question entity ){
-		System.out.println(entity.getId());
-		System.out.println(entity.getQuTitle());
 		super.save(entity);
 	}
 	/**
@@ -81,7 +79,6 @@ public class QuestionDaoImpl extends BaseDaoImpl<Question, String> implements Qu
 		}else if(quType==QuType.MULTIFILLBLANK){
 			saveMultiFillblank(entity, session);
 		}else if(quType==QuType.BIGQU){
-			System.out.println("save_bigqu");
 			saveQuBig(entity, session);
 		}else if(quType==QuType.SCORE){
 			saveQuScore(entity,session);
@@ -107,7 +104,6 @@ public class QuestionDaoImpl extends BaseDaoImpl<Question, String> implements Qu
 					questionLogic.setId(null);
 				}
 				questionLogic.setCkQuId(entity.getId());
-				System.out.println("questionLogic.getVisibility();:"+questionLogic.getVisibility());
 				session.saveOrUpdate(questionLogic);
 			}
 		}
@@ -161,7 +157,6 @@ public class QuestionDaoImpl extends BaseDaoImpl<Question, String> implements Qu
 	 * @param session
 	 */
 	private void saveQuChenRadio(Question entity, Session session,boolean isnew) {
-		System.out.println("...saveChenRadio....");
 		//保存相关选项信息
 		saveRows(entity,session);
 		saveColumns(entity,session);		
@@ -216,7 +211,6 @@ public class QuestionDaoImpl extends BaseDaoImpl<Question, String> implements Qu
 	 */
 	private void saveQuScore(Question entity, Session session) {
 		List<QuScore> quScores=entity.getQuScores();
-		System.out.println(quScores.size());
 		for (QuScore quScore : quScores) {
 			quScore.setQuId(entity.getId());
 			session.saveOrUpdate(quScore);
@@ -230,7 +224,6 @@ public class QuestionDaoImpl extends BaseDaoImpl<Question, String> implements Qu
 	 */
 	private void saveQuOrderby(Question entity, Session session) {
 		List<QuOrderby> quOrderbys=entity.getQuOrderbys();
-		System.out.println(quOrderbys.size());
 		for (QuOrderby quOrderby : quOrderbys) {
 			quOrderby.setQuId(entity.getId());
 			session.saveOrUpdate(quOrderby);
@@ -245,8 +238,6 @@ public class QuestionDaoImpl extends BaseDaoImpl<Question, String> implements Qu
 		List<Question> questions=entity.getQuestions();
 		session.save(entity);
 		for (Question question : questions) {
-			System.out.println("bigqu-child:"+question.getQuName());
-			System.out.println(question);
 			question.setParentQuId(entity.getId());
 			saveQuestion(question,session);
 		}

src/main/java/com/key/dwsurvey/dao/impl/SurveyAnswerDaoImpl.java

@@ -571,7 +571,6 @@ public class SurveyAnswerDaoImpl extends BaseDaoImpl<SurveyAnswer, String> imple
 			sqlBuf.append("count(case when data_source =2 then data_source end) datasource2, ");
 			sqlBuf.append("count(case when data_source =3 then data_source end) datasource3 ");
 			sqlBuf.append("from t_survey_answer where survey_id=? ");
-			System.out.println(sqlBuf.toString());
 			Object[] objects = (Object[]) this.getSession().createSQLQuery(sqlBuf.toString()).setString(0, surveyStats.getSurveyId()).uniqueResult();
 			
 			surveyStats.setFirstAnswer((Date)objects[0]);

src/main/java/com/key/dwsurvey/service/impl/QuChenColumnManagerImpl.java

@@ -80,7 +80,6 @@ public class QuChenColumnManagerImpl extends BaseServiceImpl<QuChenColumn, Strin
 			int orderById=getOrderById(quId);
 			//新加选项
 			QuChenColumn quChenColumn=new QuChenColumn();
-			System.out.println("quId:"+quId);
 			quChenColumn.setQuId(quId);
 			quChenColumn.setOptionName(optionName);
 			//title

src/main/java/com/key/dwsurvey/service/impl/SurveyAnswerManagerImpl.java

@@ -141,7 +141,6 @@ public class SurveyAnswerManagerImpl extends
 	private int getquestionAnswer(String surveyAnswerId, Question question) {
 		int score = 0;
 		String quId = question.getId();
-		System.out.println(question.getQuName());
 		// 查询每一题的答案,如果是主观题，则判断是否答对
 		QuType quType = question.getQuType();
 		if (quType == QuType.YESNO) {// 是非题答案
@@ -311,7 +310,6 @@ public class SurveyAnswerManagerImpl extends
 				for (int j = 0; j < answers.size(); j++) {
 					SurveyAnswer surveyAnswer = answers.get(j);
 					String surveyAnswerId = surveyAnswer.getId();
-					System.out.println("answerId:" + surveyAnswerId);
 					// 得到详细结果
 					exportUtil.createRow((j + 1) + ((i - 1) * 100));
 					exportXLSRow(exportUtil, surveyAnswerId, questions, surveyAnswer);

src/main/java/com/key/dwsurvey/service/impl/SurveyDirectoryManagerImpl.java

@@ -82,7 +82,6 @@ public class SurveyDirectoryManagerImpl extends BaseServiceImpl<SurveyDirectory,
 //			super.save(t);
 			surveyDirectoryDao.save(t);
 			//保存SurveyDirectory
-			System.out.println("getDirType:..."+t.getDirType());
 			if(t.getDirType()==2){
 				SurveyDetail surveyDetailTemp=t.getSurveyDetail();
 				
@@ -95,9 +94,7 @@ public class SurveyDirectoryManagerImpl extends BaseServiceImpl<SurveyDirectory,
 					surveyDetail=new SurveyDetail();
 					surveyDetail.setSurveyNote("非常感谢您的参与！如有涉及个人信息，我们将严格保密。");
 				}
-				System.out.println("dirType..."+surveyDetail.getSurveyNote());
 				surveyDetail.setDirId(t.getId());
-				System.out.println("surveyDetail.getShowAnswerDa():"+surveyDetail.getShowAnswerDa());
 				surveyDetailManager.save(surveyDetail);
 			}
 		}
@@ -325,7 +322,6 @@ public class SurveyDirectoryManagerImpl extends BaseServiceImpl<SurveyDirectory,
 		super.save(t);
 		//保存SurveyDirectory
 		if(t.getDirType()==2){
-			System.out.println("dirType...");
 			SurveyDetail surveyDetail=t.getSurveyDetail();
 			surveyDetail.setDirId(t.getId());
 			surveyDetailManager.save(surveyDetail);

src/main/java/com/key/dwsurvey/service/impl/SurveyStatsManagerImpl.java

@@ -319,7 +319,6 @@ public class SurveyStatsManagerImpl extends
 					if(optionName.length()>15){
 						optionName=optionName.substring(0, 15)+"...";
 					}
-					System.out.println(optionName);
 					dataCross.setOptionName(optionName);
 				}
 				String statJson = JSONArray.fromObject(crosses).toString();
@@ -343,7 +342,6 @@ public class SurveyStatsManagerImpl extends
 				if(optionName.length()>15){
 					optionName=optionName.substring(0, 15)+"...";
 				}
-				System.out.println(optionName);
 				dataCross.setOptionName(optionName);
 			}
 			String statJson = JSONArray.fromObject(crosses).toString();
@@ -399,7 +397,6 @@ public class SurveyStatsManagerImpl extends
 			
 			textStr = htmlStr.trim();
 		} catch (Exception e) {
-			System.out.println("获取HTML中的text出错:");
 			e.printStackTrace();
 		}
 		return textStr;// 返回文本字符串

src/main/webapp/js/dw/dw-design-init.js

@@ -2075,9 +2075,7 @@ function saveRadio(quItemBody,callback){
 			quTitle=escape(encodeURIComponent(quTitle));
 			data+="&quTitle="+quTitle;
 		}
-		
-		//var data="belongId="+questionBelongId+"&orderById="+orderById+"&tag="+svTag+"&quType="+quType+"&quTitle="+quTitle+"&quId="+quId;
-		//var quItemLis=quItemBody.find(".quCoItem li.quCoItemUlLi");
+
 		var quItemOptions=null;
 		if(hv==3){
 			//还有是table的情况需要处理
@@ -2280,8 +2278,6 @@ function saveCheckbox(quItemBody,callback){
 			quTitle=escape(encodeURIComponent(quTitle));
 			data+="&quTitle="+quTitle;
 		}
-		//var data="belongId="+questionBelongId+"&orderById="+orderById+"&tag="+svTag+"&quType="+quType+"&quTitle="+quTitle+"&quId="+quId;
-		//var quItemLis=quItemBody.find(".quCoItem li.quCoItemUlLi");
 		var quItemOptions=null;
 		if(hv==3){
 			//还有是table的情况需要处理
@@ -2643,8 +2639,6 @@ function saveScore(quItemBody,callback){
 			quTitle=escape(encodeURIComponent(quTitle));
 			data+="&quTitle="+quTitle;
 		}
-		//var data="belongId="+questionBelongId+"&orderById="+orderById+"&tag="+svTag+"&quType="+quType+"&quTitle="+quTitle+"&quId="+quId;
-		//var quItemLis=quItemBody.find(".quCoItem li.quCoItemUlLi");
 		//评分题选项td
 		var quItemOptions=quItemBody.find(".quCoItem table.quCoItemTable tr td.quOptionEditTd");
 		$.each(quItemOptions,function(i){
@@ -2808,8 +2802,6 @@ function saveOrderqu(quItemBody,callback){
 			quTitle=escape(encodeURIComponent(quTitle));
 			data+="&quTitle="+quTitle;
 		}
-		//var data="belongId="+questionBelongId+"&orderById="+orderById+"&tag="+svTag+"&quType="+quType+"&quTitle="+quTitle+"&quId="+quId;
-		//var quItemLis=quItemBody.find(".quCoItem li.quCoItemUlLi");
 		//评分题选项td
 		var quItemOptions=quItemBody.find(".quCoItem .quOrderByLeft  li.quCoItemUlLi");
 		$.each(quItemOptions,function(i){
@@ -3144,8 +3136,6 @@ function saveMultiFillblank(quItemBody,callback){
 			quTitle=escape(encodeURIComponent(quTitle));
 			data+="&quTitle="+quTitle;
 		}
-		//var data="belongId="+questionBelongId+"&orderById="+orderById+"&tag="+svTag+"&quType="+quType+"&quTitle="+quTitle+"&quId="+quId;
-		//var quItemLis=quItemBody.find(".quCoItem li.quCoItemUlLi");
 		//评分题选项td
 		var quItemOptions=quItemBody.find(".quCoItem table.mFillblankTable tr td.mFillblankTableEditTd");
 		$.each(quItemOptions,function(i){
@@ -3483,9 +3473,11 @@ function deleteChenOption(){
 	var curEditTd=$(curEditObj).parents("td");
 	var curEditTdClass=curEditTd.attr("class");
 	if(curEditTdClass.indexOf("Column")>=0){
-		deleteChenRadioColumnOption();
+		// deleteChenRadioColumnOption();
+		deleteChenColumnOption();
 	}else{
-		deleteChenRadioRowOption();
+		// deleteChenRadioRowOption();
+		deleteChenRowOption();
 	}
 }
 /** 删除矩阵单选题列选项 **/
@@ -3837,23 +3829,4 @@ function notify(msg,delayHid) {
 		}, function() {
 			$( this ).remove();
 		});
-}
-
-/*
-//触发input菜单框
-function showInputMenuBtn(editAbleObj){
-	var quItemBody=$(editAbleObj).parents(".surveyQuItemBody");
-	var quType=quItemBody.find("input[name='quType']").val();
-	if(quType=="FILLBLANK"){
-		$("#dwCommonInputMenuRoot").show();
-		var fillblankInputObj=$(editAbleObj).find("input");
-		var editOffset=$(fillblankInputObj).offset();
-		var offLeft=editOffset.left+$(fillblankInputObj).width()+10;
-		$("#dwCommonInputMenuRoot").offset({top:editOffset.top,left:offLeft});
-		//quItemBody.find("input[name='hoverTag']").val("hover");
-	}
-}
-function hideInputMenuBtn(){
-	$("#dwCommonInputMenuRoot").hide();
-}
-*/
+}