补充

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

@@ -47,9 +47,7 @@ public class ReportAction extends ActionSupport{
 	private String sid;
 	
 	public String execute() throws Exception {
-		// TODO Auto-generated method stub
 		// 得到频数分析数据
-//		directory=directoryManager.getSurvey(surveyId);
 		directory=directoryManager.getSurveyBySid(sid);
 		Integer viewAnswer=directory.getViewAnswer();
 

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

@@ -76,14 +76,6 @@ public class SurveyAction extends ActionSupport{
 	public String execute() throws Exception {
 		HttpServletRequest request=Struts2Utils.getRequest();
 		HttpServletResponse response=Struts2Utils.getResponse();
-//		SurveyDirectory surveyDirectory=surveyDirectoryManager.getSurveyBySid(sid);
-//		surveyId=surveyDirectory.getId();
-//		//收集规则处理
-//		
-//		String htmlPath=surveyDirectory.getHtmlPath();
-//		System.out.println(htmlPath);
-//		request.getRequestDispatcher("/"+htmlPath).forward(request, response);
-		
 		String htmlPath="http://wj.diaowen.net/test";
 		//request.getRequestDispatcher(htmlPath).forward(request, response);
 		response.sendRedirect(htmlPath);
@@ -154,18 +146,8 @@ public class SurveyAction extends ActionSupport{
     		   responseOutputStream.flush();
     		   responseOutputStream.close();
 	        }
-	        /*
-	        //String filePath="WEB-INF/wjHtml/"+dateFormat.format(createDate);
-	        String fileRealPath =  request.getSession().getServletContext().getRealPath("/") + "WEB-INF/wjHtml/jpg/";
-	        String fileName=surveyId+".jpg";
-	     // 把jsp输出的内容写到xxx.htm
-	        File file = jpgWriteLocal(fileName, fileRealPath, jpegOutputStream);
-	     // 阿里云支持 将文件写入到aliyun oss
-			AliyunOSS.pubObjects(file,fileName);
-			file.delete();
-			*/
-	        
-			
+
+
 	        return null;
 	}
 

src/main/java/com/key/dwsurvey/entity/SurveyDirectory.java

@@ -45,7 +45,7 @@ public class SurveyDirectory extends IdEntity{
 	//是否显示  1显示 0不显示
 	private Integer visibility=1;
 
-	//问卷所属的问卷模块   1问卷模块，2测评，3投票 4＝3.0版引用模板
+	//问卷所属的问卷模块   1问卷模块
 	private Integer surveyModel=1;
 	//是否公开结果  0不  1公开
 	private Integer viewAnswer=0;
@@ -58,8 +58,6 @@ public class SurveyDirectory extends IdEntity{
 	
 	//静态HTML保存路径
 	private String htmlPath;
-
-//	private List<SurveyGroup> surveyGroups=new ArrayList<SurveyGroup>();
 	
 	public String getParentId() {
 		return parentId;
@@ -141,18 +139,6 @@ public class SurveyDirectory extends IdEntity{
 	public void setUserId(String userId) {
 		this.userId = userId;
 	}
-	
-	/*
-	@ManyToMany(cascade = { CascadeType.PERSIST, CascadeType.MERGE }, fetch = FetchType.LAZY, targetEntity = SurveyGroup.class)
-	@JoinTable(name = "T_SURVEYDIR_GROUPS", joinColumns = { @JoinColumn(name = "SURVEY_Id") }, inverseJoinColumns = { @JoinColumn(name = "GROUP_ID") })
-	public List<SurveyGroup> getSurveyGroups() {
-		return surveyGroups;
-	}
-
-	public void setSurveyGroups(List<SurveyGroup> surveyGroups) {
-		this.surveyGroups = surveyGroups;
-	}
-	*/
 
 	public Integer getSurveyTag() {
 		return surveyTag;