From e7d09ea7a4eb806b1ca9866f3617fa9d7810faa3 Mon Sep 17 00:00:00 2001
From: Elvis <eluis@psunsky.com>
Date: Mon, 15 Apr 2019 17:24:54 +0800
Subject: [PATCH] 修改bug

---
 WebRoot/WEB-INF/jsp/sunvote/sclass/sclass_list2.jsp        | 14 ++++++++++++--
 resources/mybatis1/api/V1Mapper.xml                        |  1 +
 src/com/fh/bean/ResultHomework.java                        |  9 +++++++++
 src/com/fh/controller/api/V1.java                          |  3 ++-
 src/com/fh/controller/sunvote/sclass/SClassController.java |  1 -
 src/com/fh/controller/system/login/LoginController.java    |  4 +++-
 src/com/fh/plugin/websocketInstantMsg/ChatServer.java      | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------
 7 files changed, 91 insertions(+), 12 deletions(-)

diff --git a/WebRoot/WEB-INF/jsp/sunvote/sclass/sclass_list2.jsp b/WebRoot/WEB-INF/jsp/sunvote/sclass/sclass_list2.jsp
index eeee7b3..c4e6843 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/sclass/sclass_list2.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/sclass/sclass_list2.jsp
@@ -84,7 +84,7 @@
 									<td class='center'>${var.CLASS_CODE}</td>
 									<td class='center'>${myelfun:findBasestationName(var.BASESTATION_ID)}</td>
 									
-									<td><a onclick="edit('${var.ID}');" style="margin-right:10px;"><img src="static/images/eidtor.png" /></a><a href="#" onclick="del('${var.ID}');"><img src="static/images/remove.png" /></a></td>
+									<td><a onclick="edit('${var.ID}');" style="margin-right:10px;"><img src="static/images/eidtor.png" /></a><a onclick="del('${var.ID}');"><img src="static/images/remove.png" /></a></td>
 								</tr>
 							</c:forEach>
 						</c:when>
@@ -164,7 +164,17 @@
 					  }
 					}
 					if(str==''){
-						
+						$.ajax({
+							type: "POST",
+							url: '<%=basePath%>sclass/deleteAll.do?tm='+new Date().getTime(),
+					    	data: {DATA_IDS:Id},
+							dataType:'json',
+							//beforeSend: validateData,
+							cache: false,
+							success: function(data){
+								tosearch();
+							}
+						});
 					}else{
 						$.ajax({
 								type: "POST",
diff --git a/resources/mybatis1/api/V1Mapper.xml b/resources/mybatis1/api/V1Mapper.xml
index 66ba75f..1caa796 100644
--- a/resources/mybatis1/api/V1Mapper.xml
+++ b/resources/mybatis1/api/V1Mapper.xml
@@ -158,6 +158,7 @@
 				sv_teacher.`NAME` AS TNAME,
 				sv_school.`NAME` AS SNAME,
 				sv_teacher.SCHOOL_ID,
+				sv_teacher.SUBJECT_IDS AS SUBJECT_ID,
 				sv_teacher.ID AS ID
 			FROM
 				sv_teacher
diff --git a/src/com/fh/bean/ResultHomework.java b/src/com/fh/bean/ResultHomework.java
index c9c2981..9f160fc 100644
--- a/src/com/fh/bean/ResultHomework.java
+++ b/src/com/fh/bean/ResultHomework.java
@@ -103,6 +103,7 @@ public class ResultHomework {
 		private String GET_SCORE;
 		private String RANK;
 		private String ANSWER;
+		private String COMPLETE_COUNT;
 
 		public void setSTUDENT_NO(String STUDENT_NO) {
 			this.STUDENT_NO = STUDENT_NO;
@@ -159,5 +160,13 @@ public class ResultHomework {
 		public String getANSWER() {
 			return ANSWER;
 		}
+
+		public String getCOMPLETE_COUNT() {
+			return COMPLETE_COUNT;
+		}
+
+		public void setCOMPLETE_COUNT(String cOMPLETE_COUNT) {
+			COMPLETE_COUNT = cOMPLETE_COUNT;
+		}
 	}
 }
diff --git a/src/com/fh/controller/api/V1.java b/src/com/fh/controller/api/V1.java
index bdb3338..7b3058f 100644
--- a/src/com/fh/controller/api/V1.java
+++ b/src/com/fh/controller/api/V1.java
@@ -2912,6 +2912,7 @@ public class V1 extends BaseController {
 					ptd.put("RIGHT_PERSENT", "0%");
 					ptd.put("GET_SCORE", "0");
 					ptd.put("ANSWER", "");
+					ptd.put("COMPLETE_COUNT", "0");
 					ptd.put("WHETHER", "0");
 					ptd.put("HOMEWORK_ID", resultHomework.getHOMEWORK_ID());
 				}
@@ -2932,8 +2933,8 @@ public class V1 extends BaseController {
 				tpd.put("RIGHT_PERSENT", student.getRIGHT_PERSENT());
 				tpd.put("GET_SCORE", student.getGET_SCORE());
 				tpd.put("ANSWER", student.getANSWER());
+				tpd.put("COMPLETE_COUNT", student.getCOMPLETE_COUNT());
 				tpd.put("HOMEWORK_ID", resultHomework.getHOMEWORK_ID());
-				tpd.put("WHETHER", "1");
 				homeworkReporkService.update(tpd);
 			}
 			res.setData(resultHomework.getHOMEWORK_ID());
diff --git a/src/com/fh/controller/sunvote/sclass/SClassController.java b/src/com/fh/controller/sunvote/sclass/SClassController.java
index 5cd4644..6d232e7 100644
--- a/src/com/fh/controller/sunvote/sclass/SClassController.java
+++ b/src/com/fh/controller/sunvote/sclass/SClassController.java
@@ -295,7 +295,6 @@ public class SClassController extends BaseController {
 	@ResponseBody
 	public Object deleteAll() throws Exception{
 		logBefore(logger, Jurisdiction.getUsername()+"批量删除SClass");
-		if(!Jurisdiction.buttonJurisdiction(menuUrl, "del")){return null;} //校验权限
 		PageData pd = new PageData();		
 		Map<String,Object> map = new HashMap<String,Object>();
 		pd = this.getPageData();
diff --git a/src/com/fh/controller/system/login/LoginController.java b/src/com/fh/controller/system/login/LoginController.java
index 833465c..53e6fac 100644
--- a/src/com/fh/controller/system/login/LoginController.java
+++ b/src/com/fh/controller/system/login/LoginController.java
@@ -264,8 +264,10 @@ public class LoginController extends BaseController {
 					}
 					mv.addObject("user", user);
 					pd.put("SYSNAME", Tools.readTxtFile(Const.SYSNAME)); // 读取系统名称
+					mv.addObject("templateInfos", pagetemplateService.listAll(teacherInfo));
 					if(pd.get("DEFAULTURL") == null){
-						pd.put("DEFAULTURL", "../homework/list.do");
+//						pd.put("DEFAULTURL", "../homework/list.do");
+						pd.put("DEFAULTURL", "../paper/list2.do");
 					}
 					mv.addObject("pd", pd);
 					return mv;
diff --git a/src/com/fh/plugin/websocketInstantMsg/ChatServer.java b/src/com/fh/plugin/websocketInstantMsg/ChatServer.java
index 1eed499..edfd82f 100644
--- a/src/com/fh/plugin/websocketInstantMsg/ChatServer.java
+++ b/src/com/fh/plugin/websocketInstantMsg/ChatServer.java
@@ -1,18 +1,23 @@
 package com.fh.plugin.websocketInstantMsg;
 
-import java.io.IOException;
+import java.io.UnsupportedEncodingException;
 import java.net.InetSocketAddress;
+import java.net.URI;
 import java.net.UnknownHostException;
+import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Scanner;
 
 import net.sf.json.JSONObject;
 
 import org.java_websocket.WebSocket;
-import org.java_websocket.WebSocketImpl;
+import org.java_websocket.client.WebSocketClient;
+import org.java_websocket.drafts.Draft_17;
 import org.java_websocket.framing.Framedata;
 import org.java_websocket.handshake.ClientHandshake;
+import org.java_websocket.handshake.ServerHandshake;
 import org.java_websocket.server.WebSocketServer;
 
 
@@ -107,13 +112,65 @@ public class ChatServer extends WebSocketServer{
 //			ChatServerPool.sendMessage(joinMsg);					//向在线用户发送当前用户退出的消息
 //		}
 	}
-	public static void main( String[] args ) throws InterruptedException , IOException {
-		WebSocketImpl.DEBUG = false;
-		int port = 8887; //端口
-		ChatServer s = new ChatServer(port);
-		s.start();
+	public static void main( String[] args ) throws Exception {
+//		WebSocketImpl.DEBUG = false;
+//		int port = 8887; //端口
+//		ChatServer s = new ChatServer(port);
+//		s.start();
 		//System.out.println( "服务器的端口" + s.getPort() );
+		testClient();
+		Scanner scanner = new Scanner(System.in);
+		while(true){
+			String text = scanner.next();
+			if(!"exit".equals(text.toLowerCase())){
+				client.send(text);
+			}
+		}
 	}
+	
+	 public static WebSocketClient client;
+
+	public static void testClient() throws Exception{
+		client = new WebSocketClient(new URI("ws://127.0.0.1:8080/echo"),new Draft_17()) {
+            @Override
+            public void onOpen(ServerHandshake arg0) {
+                System.out.println("打开链接");
+                client.send("hello world");
+            }
+ 
+            @Override
+            public void onMessage(String arg0) {
+                System.out.println(arg0);
+            }
+ 
+            @Override
+            public void onError(Exception arg0) {
+                arg0.printStackTrace();
+                System.out.println("发生错误已关闭");
+            }
+ 
+            @Override
+            public void onClose(int arg0, String arg1, boolean arg2) {
+                System.out.println("链接已关闭");
+            }
+ 
+            @Override
+            public void onMessage(ByteBuffer bytes) {
+                try {
+                    System.out.println(new String(bytes.array(),"utf-8"));
+                } catch (UnsupportedEncodingException e) {
+                    e.printStackTrace();
+                }
+            }
+        };
+ 
+        client.connect();
+       
+    }
+ 
+    public static void send(byte[] bytes){
+        client.send(bytes);
+    }
 
 }
 
--
libgit2 0.21.4