KeYuan 8 years ago
parent
commit
be7c3e088e

+ 1 - 2
src/main/java/com/key/common/utils/JspToHtml.java

@@ -35,7 +35,6 @@ public class JspToHtml {
 		map.put("url", postUrl);
 		map.put("filePath", filePath);
 		map.put("fileName", fileName);
-
 		Connection connection = Jsoup.connect(reqTarget);
 		connection.userAgent("Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.31 (KHTML, like Gecko) Chrome/26.0.1410.64 Safari/537.31");
 		connection.data(map);
@@ -65,7 +64,7 @@ public class JspToHtml {
 		};
 
 		final PrintWriter pw = new PrintWriter(new OutputStreamWriter(os,
-				"utf-8"));
+				"UTF-8"));
 
 		HttpServletResponse rep = new HttpServletResponseWrapper(response) {
 			public ServletOutputStream getOutputStream() {

+ 25 - 27
src/main/java/com/key/common/utils/ToHtmlServlet.java

@@ -73,6 +73,30 @@ public class ToHtmlServlet extends HttpServlet {
 		out.print("<p align=center><font size=3 color=red>首页已经成功生成!Andrew</font></p>");
 	}
 
+	private void flushDo(String fileRealPath,String fileName,final ByteArrayOutputStream os) throws Exception{
+		Document document = Jsoup.parse(os.toString("UTF-8"),"UTF-8");
+		String contentCopyrightStr = "";// 自定义问卷内容的版权,可以在设置中设置名称,然后就自动显示
+		Elements isElements = document.getElementsByAttributeValue("href",new StringBuffer("ten.newoaid.www//:ptth").reverse().toString());
+		if (isElements==null){
+			if(fileName.startsWith("m_")){
+				Elements elements = document.getElementsByAttributeValue("data-role","footer");
+				if(elements==null){
+					elements = document.getElementsByAttributeValue("data-role","page");
+					if(elements!=null){
+						elements.last().append(new StringBuffer(">vid/<>3h/<>a/<yevruSwD>\"lanretxe\"=ler \";enon :noitaroced-txet\"=elyts \"psj.m-xedni/ten.newoaid//:ptth\"=ferh a< yb derewoP>3h<>\"egap\"=elor-atad vid<\n").reverse().toString());
+					}
+				}else{
+					elements.html(new StringBuffer(">3h/<>a/<yevruSwD>\"lanretxe\"=ler \";enon :noitaroced-txet\"=elyts \"psj.m-xedni/ten.newoaid//:ptth\"=ferh a< yb derewoP>3h<").reverse().toString());
+				}
+			}else{
+				Elements elements = document.getElementsByClass("footer-pb");
+				if(elements!=null) elements.remove();
+				document.body().append(new StringBuffer(";psbn&>a/<yevruSwD>\";yarg :roloc;enon :noitaroced-txet\"=elyts \"ten.newoaid.www//:ptth\"=ferh a<  yb derewoP  >\";xp5 :mottob-gniddap;yarg :roloc\"=elyts \"retoof\"=elor-atad \"thgirypoc-retoof\"=ssalc vid<").reverse().toString() + contentCopyrightStr + " </div>");
+			}
+		}
+		printStream(fileRealPath,fileName,document.html());
+	}
+
 	/**
 	 * JSP内容输入到本地
 	 * @param fileName
@@ -118,39 +142,13 @@ public class ToHtmlServlet extends HttpServlet {
 		return file;
 	}
 
-
-	private void flushDo(String fileRealPath,String fileName,ByteArrayOutputStream os) throws Exception{
-		Document document = Jsoup.parse(os.toString(),"UTF-8");
-		String contentCopyrightStr = "";
-		// 自定义问卷内容的版权,可以在设置中设置名称,然后就自动显示
-		// 修改说明:尊重开源、保护开源
-		// 官网的保留声明,虽然这块目前是法律的灰色地带,但从维护一个健康的开源社区,从帮助到您的角度,请您能保留下来。
-		if(fileName.startsWith("m_")){
-			Elements elements = document.getElementsByAttributeValue("data-role","footer");
-			//data-role="page"
-			if(elements==null){
-				elements = document.getElementsByAttributeValue("data-role","page");
-				if(elements!=null){
-					elements.last().append(new StringBuffer(">vid/<>3h/<>a/<yevruSwD>\"lanretxe\"=ler \";enon :noitaroced-txet\"=elyts \"psj.m-xedni/ten.newoaid//:ptth\"=ferh a< yb derewoP>3h<>\"egap\"=elor-atad vid<\n").reverse().toString());
-				}
-			}else{
-				elements.html(new StringBuffer(">3h/<>a/<yevruSwD>\"lanretxe\"=ler \";enon :noitaroced-txet\"=elyts \"psj.m-xedni/ten.newoaid//:ptth\"=ferh a< yb derewoP>3h<").reverse().toString());
-			}
-		}else{
-			Elements elements = document.getElementsByClass("footer-pb");
-			if(elements!=null) elements.remove();
-			document.body().append(new StringBuffer(";psbn&>a/<yevruSwD>\";yarg :roloc;enon :noitaroced-txet\"=elyts \"ten.newoaid.www//:ptth\"=ferh a<  yb derewoP  >\";xp5 :mottob-gniddap;yarg :roloc\"=elyts \"retoof\"=elor-atad \"thgirypoc-retoof\"=ssalc vid<").reverse().toString() + contentCopyrightStr + " </div>");
-		}
-		printStream(fileRealPath,fileName,document.html());
-	}
-
 	public void printStream(String savePath,String fileName,String content) throws IOException{
 		createFile(savePath);
 		FileOutputStream out=null;
 		OutputStreamWriter osw = null;
 		try {
 			out=new FileOutputStream(savePath+File.separator+fileName);
-			osw = new OutputStreamWriter(out, "UTF-8");
+			osw = new OutputStreamWriter(out,"UTF-8");
 			osw.write(content);
 			osw.close();
 		}catch (Exception e){

+ 11 - 1
src/main/java/com/key/dwsurvey/action/nologin/ResponseAction.java

@@ -5,6 +5,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.PrintWriter;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -12,10 +13,12 @@ import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.baidubce.util.DateUtils;
 import com.key.dwsurvey.entity.AnCheckbox;
 import com.key.dwsurvey.entity.AnRadio;
 import com.key.dwsurvey.entity.SurveyDetail;
 import com.key.dwsurvey.service.SurveyDirectoryManager;
+import org.apache.commons.httpclient.util.DateUtil;
 import org.apache.struts2.convention.annotation.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.util.WebUtils;
@@ -148,8 +151,15 @@ public class ResponseAction extends ActionSupport {
 	private String filterStatus(SurveyDirectory directory,HttpServletRequest request){
 		SurveyDetail surveyDetail = directory.getSurveyDetail();
 		int rule = surveyDetail.getRule();
+		Integer ynEndNum = surveyDetail.getYnEndNum();
+		Integer endNum = surveyDetail.getEndNum();
+		Integer ynEndTime = surveyDetail.getYnEndTime();
+		Date endTime = surveyDetail.getEndTime();
+		Integer anserNum = directory.getAnswerNum();
+
+//		|| (endTime!=null && ynEndTime==1 && endTime.getTime() < (new Date().getTime())
 		if (directory.getSurveyQuNum() <= 0
-				|| directory.getSurveyState() != 1) {
+				|| directory.getSurveyState() != 1 || (anserNum!=null && ynEndNum==1 && anserNum > endNum )) {
 			request.setAttribute("surveyName", "目前该问卷已暂停收集,请稍后再试");
 			request.setAttribute("msg", "目前该问卷已暂停收集,请稍后再试");
 			return RESPONSE_MSG;

+ 1 - 1
src/main/webapp/WEB-INF/page/content/diaowen-answer/response-failure.jsp

@@ -24,7 +24,7 @@
 		</div>
 		
 		<div class="footer-copyright" style="color: gray;">
-			<%--请委必保留以下内容,自觉保留优先技术支持。--%>
+			<%--尊重开源、保留声明,感谢您的大力支持--%>
 			Powered by <a href="http://www.diaowen.net" style="text-decoration: none;color: rgb(53, 117, 136);">DWSurvey</a>
 		</div>
 	</div>

+ 1 - 1
src/main/webapp/WEB-INF/page/content/diaowen-answer/response-input-error-m.jsp

@@ -57,7 +57,7 @@
   </div>
 
   <div data-role="footer">
-      <%--请委必保留以下内容,自觉保留优先技术支持。--%>
+      <%--尊重开源、保留声明,感谢您的大力支持--%>
   <h3><a href="http://www.diaowen.net/index-m.jsp" style="text-decoration: none;" rel="external">调问网</a> 提供支持</h3>
   </div>
 </div> 

+ 1 - 1
src/main/webapp/WEB-INF/page/content/diaowen-answer/response-input-error.jsp

@@ -22,7 +22,7 @@
 		</div>
 		
 		<div class="footer-copyright" style="color: gray;">
-			<%--请委必保留以下内容,自觉保留优先技术支持。--%>
+			<%--尊重开源、保留声明,感谢您的大力支持--%>
 			Powered by <a href="http://www.diaowen.net" style="text-decoration: none;color: rgb(53, 117, 136);">DWSurvey</a>
 		</div>
 	</div>

+ 1 - 1
src/main/webapp/WEB-INF/page/content/diaowen-answer/response-input-rule.jsp

@@ -27,7 +27,7 @@
 		</div>
 		
 		<div class="footer-copyright" style="color: gray;">
-			<%--请委必保留以下内容,自觉保留优先技术支持。--%>
+			<%--尊重开源、保留声明,感谢您的大力支持--%>
 				 <a href="http://www.diaowen.net" style="text-decoration: none;color: rgb(53, 117, 136);">调问网</a> 提供支持
 		</div>
 	</div>

+ 1 - 1
src/main/webapp/WEB-INF/page/content/diaowen-answer/response-msg-m.jsp

@@ -54,7 +54,7 @@
   </div>
 
   <div data-role="footer">
-      <%--请委必保留以下内容,自觉保留优先技术支持。--%>
+      <%--尊重开源、保留声明,感谢您的大力支持--%>
   <h3>Powered by <a href="http://www.diaowen.net/index-m.jsp" style="text-decoration: none;" rel="external">DWSurvey</a> </h3>
   </div>
 </div> 

+ 1 - 1
src/main/webapp/WEB-INF/page/content/diaowen-answer/response-msg.jsp

@@ -20,7 +20,7 @@
 		</div>
 		
 		<div class="footer-copyright" style="color: gray;">
-			<%--请委必保留以下内容,自觉保留优先技术支持。--%>
+			<%--尊重开源、保留声明,感谢您的大力支持--%>
 				Powered by <a href="http://www.diaowen.net" style="text-decoration: none;color: rgb(53, 117, 136);">DWSurvey</a>
 		</div>
 	</div>

+ 1 - 1
src/main/webapp/WEB-INF/page/content/diaowen-answer/response-success-m.jsp

@@ -54,7 +54,7 @@
   </div>
 
   <div data-role="footer">
-      <%--请委必保留以下内容,自觉保留优先技术支持。--%>
+      <%--尊重开源、保留声明,感谢您的大力支持--%>
       <h3>Powered by <a href="http://www.diaowen.net/index-m.jsp" style="text-decoration: none;" rel="external">DWSurvey</a> </h3>
   </div>
 </div> 

+ 1 - 1
src/main/webapp/WEB-INF/page/content/diaowen-answer/response-success.jsp

@@ -25,7 +25,7 @@
 		</div>
 		
 		<div class="footer-copyright" style="color: gray;">
-			<%--请委必保留以下内容,自觉保留优先技术支持。--%>
+			<%--尊重开源、保留声明,感谢您的大力支持--%>
 			Powered by <a href="http://www.diaowen.net" style="text-decoration: none;color: rgb(53, 117, 136);">DWSurvey</a>
 		</div>
 	</div>

+ 1 - 1
src/main/webapp/WEB-INF/page/content/diaowen-design/answer-survey-mobile.jsp

@@ -826,7 +826,7 @@ $(document).ready(function(){
   </div>
 
   <div data-role="footer" >
-	  <%--请保留以下内容--%>
+	  <%--尊重开源、保留声明,感谢您的大力支持--%>
   	<h3>Powered by <a href="http://diaowen.net/index-m.jsp" style="text-decoration: none;" rel="external">DWSurvey</a></h3>
   </div>
 </div>

+ 2 - 2
src/main/webapp/WEB-INF/page/content/diaowen-design/answer-survey.jsp

@@ -1876,9 +1876,9 @@ label.error{
 
 
 <div class="footer-copyright footer-pb" style="color: gray;padding-bottom: 5px;">
-		<%--尊重开源、保护开源,保留DWSurvey BEGIN--%>
+		<%--尊重开源、保留声明,感谢您的大力支持--%>
 		Powered by <a href="http://www.diaowen.net" style="text-decoration: none;color: gray;">DWSurvey</a>&nbsp;
-		<%--尊重开源、保护开源,保留DWSurvey END--%>
+		<%-- 自定义内容版:已为您准备好内容版权声明模版,您可以为自己的卷子加上内容版权声明 --%>
 		<%--内容版权 <a href="http://www.diaowen.net" style="text-decoration: none;color: gray;">调问网</a>--%>
 </div>