去除敏感字 前端和后端

WebRoot/res/particles/js/md5.js

@@ -0,0 +1,214 @@
+	/**
+	 * jQuery MD5 hash algorithm function
+	 * 
+	 * 	<code>
+	 * 		Calculate the md5 hash of a String 
+	 * 		String $.md5 ( String str )
+	 * 	</code>
+	 * 
+	 * Calculates the MD5 hash of str using the » RSA Data Security, Inc. MD5 Message-Digest Algorithm, and returns that hash. 
+	 * MD5 (Message-Digest algorithm 5) is a widely-used cryptographic hash function with a 128-bit hash value. MD5 has been employed in a wide variety of security applications, and is also commonly used to check the integrity of data. The generated hash is also non-reversable. Data cannot be retrieved from the message digest, the digest uniquely identifies the data.
+	 * MD5 was developed by Professor Ronald L. Rivest in 1994. Its 128 bit (16 byte) message digest makes it a faster implementation than SHA-1.
+	 * This script is used to process a variable length message into a fixed-length output of 128 bits using the MD5 algorithm. It is fully compatible with UTF-8 encoding. It is very useful when u want to transfer encrypted passwords over the internet. If you plan using UTF-8 encoding in your project don't forget to set the page encoding to UTF-8 (Content-Type meta tag). 
+	 * This function orginally get from the WebToolkit and rewrite for using as the jQuery plugin.
+	 * 
+	 * Example
+	 * 	Code
+	 * 		<code>
+	 * 			$.md5("I'm Persian."); 
+	 * 		</code>
+	 * 	Result
+	 * 		<code>
+	 * 			"b8c901d0f02223f9761016cfff9d68df"
+	 * 		</code>
+	 * 
+	 * @alias Muhammad Hussein Fattahizadeh < muhammad [AT] semnanweb [DOT] com >
+	 * @link http://www.semnanweb.com/jquery-plugin/md5.html
+	 * @see http://www.webtoolkit.info/
+	 * @license http://www.gnu.org/licenses/gpl.html [GNU General Public License]
+	 * @param {jQuery} {md5:function(string))
+	 * @return string
+	 */
+	(function($){
+		var rotateLeft = function(lValue, iShiftBits) {
+			return (lValue << iShiftBits) | (lValue >>> (32 - iShiftBits));
+		}
+		var addUnsigned = function(lX, lY) {
+			var lX4, lY4, lX8, lY8, lResult;
+			lX8 = (lX & 0x80000000);
+			lY8 = (lY & 0x80000000);
+			lX4 = (lX & 0x40000000);
+			lY4 = (lY & 0x40000000);
+			lResult = (lX & 0x3FFFFFFF) + (lY & 0x3FFFFFFF);
+			if (lX4 & lY4) return (lResult ^ 0x80000000 ^ lX8 ^ lY8);
+			if (lX4 | lY4) {
+				if (lResult & 0x40000000) return (lResult ^ 0xC0000000 ^ lX8 ^ lY8);
+				else return (lResult ^ 0x40000000 ^ lX8 ^ lY8);
+			} else {
+				return (lResult ^ lX8 ^ lY8);
+			}
+		}
+		var F = function(x, y, z) {
+			return (x & y) | ((~ x) & z);
+		}
+		var G = function(x, y, z) {
+			return (x & z) | (y & (~ z));
+		}
+		var H = function(x, y, z) {
+			return (x ^ y ^ z);
+		}
+		var I = function(x, y, z) {
+			return (y ^ (x | (~ z)));
+		}
+		var FF = function(a, b, c, d, x, s, ac) {
+			a = addUnsigned(a, addUnsigned(addUnsigned(F(b, c, d), x), ac));
+			return addUnsigned(rotateLeft(a, s), b);
+		};
+		var GG = function(a, b, c, d, x, s, ac) {
+			a = addUnsigned(a, addUnsigned(addUnsigned(G(b, c, d), x), ac));
+			return addUnsigned(rotateLeft(a, s), b);
+		};
+		var HH = function(a, b, c, d, x, s, ac) {
+			a = addUnsigned(a, addUnsigned(addUnsigned(H(b, c, d), x), ac));
+			return addUnsigned(rotateLeft(a, s), b);
+		};
+		var II = function(a, b, c, d, x, s, ac) {
+			a = addUnsigned(a, addUnsigned(addUnsigned(I(b, c, d), x), ac));
+			return addUnsigned(rotateLeft(a, s), b);
+		};
+		var convertToWordArray = function(string) {
+			var lWordCount;
+			var lMessageLength = string.length;
+			var lNumberOfWordsTempOne = lMessageLength + 8;
+			var lNumberOfWordsTempTwo = (lNumberOfWordsTempOne - (lNumberOfWordsTempOne % 64)) / 64;
+			var lNumberOfWords = (lNumberOfWordsTempTwo + 1) * 16;
+			var lWordArray = Array(lNumberOfWords - 1);
+			var lBytePosition = 0;
+			var lByteCount = 0;
+			while (lByteCount < lMessageLength) {
+				lWordCount = (lByteCount - (lByteCount % 4)) / 4;
+				lBytePosition = (lByteCount % 4) * 8;
+				lWordArray[lWordCount] = (lWordArray[lWordCount] | (string.charCodeAt(lByteCount) << lBytePosition));
+				lByteCount++;
+			}
+			lWordCount = (lByteCount - (lByteCount % 4)) / 4;
+			lBytePosition = (lByteCount % 4) * 8;
+			lWordArray[lWordCount] = lWordArray[lWordCount] | (0x80 << lBytePosition);
+			lWordArray[lNumberOfWords - 2] = lMessageLength << 3;
+			lWordArray[lNumberOfWords - 1] = lMessageLength >>> 29;
+			return lWordArray;
+		};
+		var wordToHex = function(lValue) {
+			var WordToHexValue = "", WordToHexValueTemp = "", lByte, lCount;
+			for (lCount = 0; lCount <= 3; lCount++) {
+				lByte = (lValue >>> (lCount * 8)) & 255;
+				WordToHexValueTemp = "0" + lByte.toString(16);
+				WordToHexValue = WordToHexValue + WordToHexValueTemp.substr(WordToHexValueTemp.length - 2, 2);
+			}
+			return WordToHexValue;
+		};
+		var uTF8Encode = function(string) {
+			string = string.replace(/\x0d\x0a/g, "\x0a");
+			var output = "";
+			for (var n = 0; n < string.length; n++) {
+				var c = string.charCodeAt(n);
+				if (c < 128) {
+					output += String.fromCharCode(c);
+				} else if ((c > 127) && (c < 2048)) {
+					output += String.fromCharCode((c >> 6) | 192);
+					output += String.fromCharCode((c & 63) | 128);
+				} else {
+					output += String.fromCharCode((c >> 12) | 224);
+					output += String.fromCharCode(((c >> 6) & 63) | 128);
+					output += String.fromCharCode((c & 63) | 128);
+				}
+			}
+			return output;
+		};
+		$.extend({
+			md5: function(string) {
+				var x = Array();
+				var k, AA, BB, CC, DD, a, b, c, d;
+				var S11=7, S12=12, S13=17, S14=22;
+				var S21=5, S22=9 , S23=14, S24=20;
+				var S31=4, S32=11, S33=16, S34=23;
+				var S41=6, S42=10, S43=15, S44=21;
+				string = uTF8Encode(string);
+				x = convertToWordArray(string);
+				a = 0x67452301; b = 0xEFCDAB89; c = 0x98BADCFE; d = 0x10325476;
+				for (k = 0; k < x.length; k += 16) {
+					AA = a; BB = b; CC = c; DD = d;
+					a = FF(a, b, c, d, x[k+0],  S11, 0xD76AA478);
+					d = FF(d, a, b, c, x[k+1],  S12, 0xE8C7B756);
+					c = FF(c, d, a, b, x[k+2],  S13, 0x242070DB);
+					b = FF(b, c, d, a, x[k+3],  S14, 0xC1BDCEEE);
+					a = FF(a, b, c, d, x[k+4],  S11, 0xF57C0FAF);
+					d = FF(d, a, b, c, x[k+5],  S12, 0x4787C62A);
+					c = FF(c, d, a, b, x[k+6],  S13, 0xA8304613);
+					b = FF(b, c, d, a, x[k+7],  S14, 0xFD469501);
+					a = FF(a, b, c, d, x[k+8],  S11, 0x698098D8);
+					d = FF(d, a, b, c, x[k+9],  S12, 0x8B44F7AF);
+					c = FF(c, d, a, b, x[k+10], S13, 0xFFFF5BB1);
+					b = FF(b, c, d, a, x[k+11], S14, 0x895CD7BE);
+					a = FF(a, b, c, d, x[k+12], S11, 0x6B901122);
+					d = FF(d, a, b, c, x[k+13], S12, 0xFD987193);
+					c = FF(c, d, a, b, x[k+14], S13, 0xA679438E);
+					b = FF(b, c, d, a, x[k+15], S14, 0x49B40821);
+					a = GG(a, b, c, d, x[k+1],  S21, 0xF61E2562);
+					d = GG(d, a, b, c, x[k+6],  S22, 0xC040B340);
+					c = GG(c, d, a, b, x[k+11], S23, 0x265E5A51);
+					b = GG(b, c, d, a, x[k+0],  S24, 0xE9B6C7AA);
+					a = GG(a, b, c, d, x[k+5],  S21, 0xD62F105D);
+					d = GG(d, a, b, c, x[k+10], S22, 0x2441453);
+					c = GG(c, d, a, b, x[k+15], S23, 0xD8A1E681);
+					b = GG(b, c, d, a, x[k+4],  S24, 0xE7D3FBC8);
+					a = GG(a, b, c, d, x[k+9],  S21, 0x21E1CDE6);
+					d = GG(d, a, b, c, x[k+14], S22, 0xC33707D6);
+					c = GG(c, d, a, b, x[k+3],  S23, 0xF4D50D87);
+					b = GG(b, c, d, a, x[k+8],  S24, 0x455A14ED);
+					a = GG(a, b, c, d, x[k+13], S21, 0xA9E3E905);
+					d = GG(d, a, b, c, x[k+2],  S22, 0xFCEFA3F8);
+					c = GG(c, d, a, b, x[k+7],  S23, 0x676F02D9);
+					b = GG(b, c, d, a, x[k+12], S24, 0x8D2A4C8A);
+					a = HH(a, b, c, d, x[k+5],  S31, 0xFFFA3942);
+					d = HH(d, a, b, c, x[k+8],  S32, 0x8771F681);
+					c = HH(c, d, a, b, x[k+11], S33, 0x6D9D6122);
+					b = HH(b, c, d, a, x[k+14], S34, 0xFDE5380C);
+					a = HH(a, b, c, d, x[k+1],  S31, 0xA4BEEA44);
+					d = HH(d, a, b, c, x[k+4],  S32, 0x4BDECFA9);
+					c = HH(c, d, a, b, x[k+7],  S33, 0xF6BB4B60);
+					b = HH(b, c, d, a, x[k+10], S34, 0xBEBFBC70);
+					a = HH(a, b, c, d, x[k+13], S31, 0x289B7EC6);
+					d = HH(d, a, b, c, x[k+0],  S32, 0xEAA127FA);
+					c = HH(c, d, a, b, x[k+3],  S33, 0xD4EF3085);
+					b = HH(b, c, d, a, x[k+6],  S34, 0x4881D05);
+					a = HH(a, b, c, d, x[k+9],  S31, 0xD9D4D039);
+					d = HH(d, a, b, c, x[k+12], S32, 0xE6DB99E5);
+					c = HH(c, d, a, b, x[k+15], S33, 0x1FA27CF8);
+					b = HH(b, c, d, a, x[k+2],  S34, 0xC4AC5665);
+					a = II(a, b, c, d, x[k+0],  S41, 0xF4292244);
+					d = II(d, a, b, c, x[k+7],  S42, 0x432AFF97);
+					c = II(c, d, a, b, x[k+14], S43, 0xAB9423A7);
+					b = II(b, c, d, a, x[k+5],  S44, 0xFC93A039);
+					a = II(a, b, c, d, x[k+12], S41, 0x655B59C3);
+					d = II(d, a, b, c, x[k+3],  S42, 0x8F0CCC92);
+					c = II(c, d, a, b, x[k+10], S43, 0xFFEFF47D);
+					b = II(b, c, d, a, x[k+1],  S44, 0x85845DD1);
+					a = II(a, b, c, d, x[k+8],  S41, 0x6FA87E4F);
+					d = II(d, a, b, c, x[k+15], S42, 0xFE2CE6E0);
+					c = II(c, d, a, b, x[k+6],  S43, 0xA3014314);
+					b = II(b, c, d, a, x[k+13], S44, 0x4E0811A1);
+					a = II(a, b, c, d, x[k+4],  S41, 0xF7537E82);
+					d = II(d, a, b, c, x[k+11], S42, 0xBD3AF235);
+					c = II(c, d, a, b, x[k+2],  S43, 0x2AD7D2BB);
+					b = II(b, c, d, a, x[k+9],  S44, 0xEB86D391);
+					a = addUnsigned(a, AA);
+					b = addUnsigned(b, BB);
+					c = addUnsigned(c, CC);
+					d = addUnsigned(d, DD);
+				}
+				var tempValue = wordToHex(a) + wordToHex(b) + wordToHex(c) + wordToHex(d);
+				return tempValue.toLowerCase();
+			}
+		});
+	})(jQuery);

WebRoot/view/checkrecord/scripts/checkrecord.js

@@ -82,8 +82,8 @@ function exportbtn_click(){
 	    fields += '{id:"'+array[i]+'",title:"'+name[i]+'",shown:"'+true+'"}';
 	}
 			var query = new Object();
-			query.V_LOGINNAME = V_LOGINNAME;
-			query.V_PASSWORD = V_PASSWORD;
+			// query.V_LOGINNAME = V_LOGINNAME;
+			// query.V_PASSWORD = V_PASSWORD;
 			query.plan_name = plan_name;
 			query.person_liable_id = person_liable_id;
 			query.data3a = data3a;
@@ -133,8 +133,8 @@ Ext.onReady(function(){
 		return unchkIcon;
 	}
 	var queryJson = new Object();
-	queryJson.V_LOGINNAME = V_LOGINNAME;
-	queryJson.V_PASSWORD =  V_PASSWORD;
+	// queryJson.V_LOGINNAME = V_LOGINNAME;
+	// queryJson.V_PASSWORD =  V_PASSWORD;
 //	queryJson.COMMSTATUS = 'NO';
 	if((company_code!=null)&&(company_code!='null')&&(company_code.length>0))
 		queryJson.company_code = company_code;
@@ -227,8 +227,8 @@ Ext.onReady(function(){
 			query.person_liable_id = person_liable_id;
 			$("#person_liable_id").val(person_liable_id);
 		}
-		query.V_LOGINNAME = V_LOGINNAME;
-		query.V_PASSWORD =  V_PASSWORD;
+		// query.V_LOGINNAME = V_LOGINNAME;
+		// query.V_PASSWORD =  V_PASSWORD;
 		var jsonstr = Ext.JSON.encode(query);
     	myStore.getProxy().extraParams = {
     		queryJson : jsonstr
@@ -331,8 +331,8 @@ Ext.onReady(function(){
 			    html:'<div id="inspectorsCheck_look_device"></div>'
 			}).show();
 			var query = new Object();
-			query.V_LOGINNAME = $("#V_LOGINNAME").val();
-			query.V_PASSWORD = $("#V_PASSWORD").val();
+			// query.V_LOGINNAME = $("#V_LOGINNAME").val();
+			// query.V_PASSWORD = $("#V_PASSWORD").val();
 			query.id = spot_id;
 			$.ajax({
 		        type:'POST',
@@ -383,8 +383,8 @@ Ext.onReady(function(){
 			    html:'<div id="inspectorsCheck_look_Presentation"></div>'
 			}).show();
 			var query = new Object();
-			query.V_LOGINNAME = $("#V_LOGINNAME").val();
-			query.V_PASSWORD = $("#V_PASSWORD").val();
+			// query.V_LOGINNAME = $("#V_LOGINNAME").val();
+			// query.V_PASSWORD = $("#V_PASSWORD").val();
 			query.jlid = spot_id;
 			$.ajax({
 		        type:'POST',
@@ -411,8 +411,8 @@ Ext.onReady(function(){
  		  query.data3 = value;
  		}
  		query.id = id;
- 		query.V_LOGINNAME = V_LOGINNAME;
- 		query.V_PASSWORD =  V_PASSWORD;
+ 		// query.V_LOGINNAME = V_LOGINNAME;
+ 		// query.V_PASSWORD =  V_PASSWORD;
  		var jsonstr = Ext.JSON.encode(query);
      	myStore1.getProxy().extraParams = {
      		queryJson : jsonstr
@@ -711,7 +711,7 @@ Ext.onReady(function(){
 	 
 		var piedarHtml = function() {
 			var query = new Object();
-				query.V_LOGINNAME = $("#V_LOGINNAME").val();
+				// query.V_LOGINNAME = $("#V_LOGINNAME").val();
 				pieMask.show();
 			$.ajax({
 		        type:'POST',
@@ -769,8 +769,8 @@ Ext.onReady(function(){
 		                    if(label.length>0){
 		                      query.id = label;
 		                    }
-		                    query.V_LOGINNAME = V_LOGINNAME;
-		                    query.V_PASSWORD =  V_PASSWORD;
+		                    // query.V_LOGINNAME = V_LOGINNAME;
+		                    // query.V_PASSWORD =  V_PASSWORD;
 		                    var jsonstr = Ext.JSON.encode(query);
 		                       myStore1.getProxy().extraParams = {
 		                        queryJson : jsonstr

WebRoot/view/checkrecord2/scripts/checkrecord2.js

@@ -82,8 +82,8 @@ function exportbtn_click(){
 	    fields += '{id:"'+array[i]+'",title:"'+name[i]+'",shown:"'+true+'"}';
 	}
 			var query = new Object();
-			query.V_LOGINNAME = V_LOGINNAME;
-			query.V_PASSWORD = V_PASSWORD;
+			// query.V_LOGINNAME = V_LOGINNAME;
+			// query.V_PASSWORD = V_PASSWORD;
 			query.plan_name = plan_name;
 			query.person_liable_id = person_liable_id;
 			query.data3a = data3a;
@@ -133,8 +133,8 @@ Ext.onReady(function(){
 		return unchkIcon;
 	}
 	var queryJson = new Object();
-	queryJson.V_LOGINNAME = V_LOGINNAME;
-	queryJson.V_PASSWORD =  V_PASSWORD;
+	// queryJson.V_LOGINNAME = V_LOGINNAME;
+	// queryJson.V_PASSWORD =  V_PASSWORD;
 //	queryJson.COMMSTATUS = 'NO';
 	if((company_code!=null)&&(company_code!='null')&&(company_code.length>0))
 		queryJson.company_code = company_code;
@@ -227,8 +227,8 @@ Ext.onReady(function(){
 			query.person_liable_id = person_liable_id;
 			$("#person_liable_id").val(person_liable_id);
 		}
-		query.V_LOGINNAME = V_LOGINNAME;
-		query.V_PASSWORD =  V_PASSWORD;
+		// query.V_LOGINNAME = V_LOGINNAME;
+		// query.V_PASSWORD =  V_PASSWORD;
 		var jsonstr = Ext.JSON.encode(query);
     	myStore.getProxy().extraParams = {
     		queryJson : jsonstr
@@ -331,8 +331,8 @@ Ext.onReady(function(){
 			    html:'<div id="maintenanceCheck_look_device"></div>'
 			}).show();
 			var query = new Object();
-			query.V_LOGINNAME = $("#V_LOGINNAME").val();
-			query.V_PASSWORD = $("#V_PASSWORD").val();
+			// query.V_LOGINNAME = $("#V_LOGINNAME").val();
+			// query.V_PASSWORD = $("#V_PASSWORD").val();
 			query.id = spot_id;
 			$.ajax({
 		        type:'POST',
@@ -383,8 +383,8 @@ Ext.onReady(function(){
 			    html:'<div id="maintenanceCheck_look_Presentation"></div>'
 			}).show();
 			var query = new Object();
-			query.V_LOGINNAME = $("#V_LOGINNAME").val();
-			query.V_PASSWORD = $("#V_PASSWORD").val();
+			// query.V_LOGINNAME = $("#V_LOGINNAME").val();
+			// query.V_PASSWORD = $("#V_PASSWORD").val();
 			query.jlid = spot_id;
 			$.ajax({
 		        type:'POST',
@@ -411,8 +411,8 @@ Ext.onReady(function(){
  		  query.data3 = value;
  		}
  		query.id = id;
- 		query.V_LOGINNAME = V_LOGINNAME;
- 		query.V_PASSWORD =  V_PASSWORD;
+ 		// query.V_LOGINNAME = V_LOGINNAME;
+ 		// query.V_PASSWORD =  V_PASSWORD;
  		var jsonstr = Ext.JSON.encode(query);
      	myStore1.getProxy().extraParams = {
      		queryJson : jsonstr
@@ -747,7 +747,7 @@ Ext.onReady(function(){
 	 
 		var piedarHtml = function() {
 			var query = new Object();
-				query.V_LOGINNAME = $("#V_LOGINNAME").val();
+				// query.V_LOGINNAME = $("#V_LOGINNAME").val();
 				pieMask.show();
 			$.ajax({
 		        type:'POST',
@@ -805,8 +805,8 @@ Ext.onReady(function(){
 		                    if(label.length>0){
 		                      query.id = label;
 		                    }
-		                    query.V_LOGINNAME = V_LOGINNAME;
-		                    query.V_PASSWORD =  V_PASSWORD;
+		                    // query.V_LOGINNAME = V_LOGINNAME;
+		                    // query.V_PASSWORD =  V_PASSWORD;
 		                    var jsonstr = Ext.JSON.encode(query);
 		                       myStore1.getProxy().extraParams = {
 		                        queryJson : jsonstr

WebRoot/view/companyxx/scripts/companyxx.js

@@ -109,8 +109,8 @@ Ext.onReady(function(){
 
 
 	var queryJson = new Object();
-	queryJson.V_LOGINNAME = V_LOGINNAME;
-	queryJson.V_PASSWORD =  V_PASSWORD;
+	// queryJson.V_LOGINNAME = V_LOGINNAME;
+	// queryJson.V_PASSWORD =  V_PASSWORD;
 	queryJson.COMMSTATUS = 'NO';
 	if((company_code!=null)&&(company_code!='null')&&(company_code.length>0))
 		queryJson.company_code = company_code;	
@@ -485,8 +485,8 @@ Ext.onReady(function(){
 			query.bjxh = bjxh;
 			$("#bjxh").val(bjxh);
 		}
-		query.V_LOGINNAME = V_LOGINNAME;
-		query.V_PASSWORD =  V_PASSWORD;
+		// query.V_LOGINNAME = V_LOGINNAME;
+		// query.V_PASSWORD =  V_PASSWORD;
 		var jsonstr = Ext.JSON.encode(query);
     	myStore.getProxy().extraParams = {
     		queryJson : jsonstr
@@ -675,7 +675,7 @@ Ext.onReady(function(){
 	 
 	 	var piedarHtml_fun = function(){
 	 		var query = new Object();
-	 		query.V_LOGINNAME = $("#V_LOGINNAME").val();
+	 		// query.V_LOGINNAME = $("#V_LOGINNAME").val();
 	 		$.ajax({
 	 			type:'POST',
 	 			url: baseUrl+"iot/pzb/getXhList",

WebRoot/view/czjl/scripts/czjl.js

@@ -103,8 +103,8 @@ Ext.onReady(function(){
 
 
 	var queryJson = new Object();
-	queryJson.V_LOGINNAME = V_LOGINNAME;
-	queryJson.V_PASSWORD =  V_PASSWORD;
+	// queryJson.V_LOGINNAME = V_LOGINNAME;
+	// queryJson.V_PASSWORD =  V_PASSWORD;
 	queryJson.COMMSTATUS = 'NO';
 	if((company_code!=null)&&(company_code!='null')&&(company_code.length>0))
 		queryJson.company_code = company_code;	
@@ -314,8 +314,8 @@ Ext.onReady(function(){
 			query.czsj2 = czsj2;
 			$("#czsj2").val(czsj2);
 		}
-		query.V_LOGINNAME = V_LOGINNAME;
-		query.V_PASSWORD =  V_PASSWORD;
+		// query.V_LOGINNAME = V_LOGINNAME;
+		// query.V_PASSWORD =  V_PASSWORD;
 		var jsonstr = Ext.JSON.encode(query);
     	myStore.getProxy().extraParams = {
     		queryJson : jsonstr

WebRoot/view/dataSearch/scripts/dataSearch.js

@@ -483,8 +483,8 @@ var show_datapie = function(record){
 			$("#operation_area").html('');
 			pieMask.show();
 			var query = new Object();
-			query.V_LOGINNAME = V_LOGINNAME;
-			query.V_PASSWORD = V_PASSWORD;
+			// query.V_LOGINNAME = V_LOGINNAME;
+			// query.V_PASSWORD = V_PASSWORD;
 			query.device_id = device_id;
 			query.point_code = point_code;
 			
@@ -593,8 +593,8 @@ Ext.onReady(function(){
 		return unchkIcon;
 	}
 	var queryJson = new Object();
-	queryJson.V_LOGINNAME = V_LOGINNAME;
-	queryJson.V_PASSWORD =  V_PASSWORD;
+	// queryJson.V_LOGINNAME = V_LOGINNAME;
+	// queryJson.V_PASSWORD =  V_PASSWORD;
 	queryJson.COMMSTATUS = 'NO';
 	if((company_code!=null)&&(company_code!='null')&&(company_code.length>0))
 		queryJson.company_code = company_code;
@@ -740,8 +740,8 @@ Ext.onReady(function(){
 		        		$("#time_end").val('');
 		        	}
 //	        		query.name = Ext.getCmp('ff_clzt').getValue()==null?"":Ext.getCmp('ff_clzt').getValue();
-	        		query.V_LOGINNAME = V_LOGINNAME;
-	        		query.V_PASSWORD =  V_PASSWORD;
+// 	        		query.V_LOGINNAME = V_LOGINNAME;
+// 	        		query.V_PASSWORD =  V_PASSWORD;
 	        		query.COMMSTATUS = 'NO';
 		        	var jsonstr = Ext.JSON.encode(query);
 		        	myStore.getProxy().extraParams = {

WebRoot/view/dataSearch/scripts/firedataSearch.js

@@ -230,8 +230,8 @@ var show_datapie = function(record){
 			$("#operation_area").html('');
 			pieMask.show();
 			var query = new Object();
-			query.V_LOGINNAME = V_LOGINNAME;
-			query.V_PASSWORD = V_PASSWORD;
+			// query.V_LOGINNAME = V_LOGINNAME;
+			// query.V_PASSWORD = V_PASSWORD;
 			query.device_id = device_id;
 			query.point_code = point_code;
 			
@@ -332,8 +332,8 @@ Ext.onReady(function(){
 		return unchkIcon;
 	}
 	var queryJson = new Object();
-	queryJson.V_LOGINNAME = V_LOGINNAME;
-	queryJson.V_PASSWORD =  V_PASSWORD;
+	// queryJson.V_LOGINNAME = V_LOGINNAME;
+	// queryJson.V_PASSWORD =  V_PASSWORD;
 	queryJson.COMMSTATUS = 'NO';
 	if((company_code!=null)&&(company_code!='null')&&(company_code.length>0))
 		queryJson.company_code = company_code;
@@ -479,8 +479,8 @@ Ext.onReady(function(){
 		        		$("#time_end").val('');
 		        	}
 //	        		query.name = Ext.getCmp('ff_clzt').getValue()==null?"":Ext.getCmp('ff_clzt').getValue();
-	        		query.V_LOGINNAME = V_LOGINNAME;
-	        		query.V_PASSWORD =  V_PASSWORD;
+// 	        		query.V_LOGINNAME = V_LOGINNAME;
+// 	        		query.V_PASSWORD =  V_PASSWORD;
 	        		query.COMMSTATUS = 'NO';
 		        	var jsonstr = Ext.JSON.encode(query);
 		        	myStore.getProxy().extraParams = {

WebRoot/view/dataSearch/scripts/rtudataSearch.js

@@ -233,8 +233,8 @@ var show_datapie = function(record){
 			$("#operation_area").html('');
 			pieMask.show();
 			var query = new Object();
-			query.V_LOGINNAME = V_LOGINNAME;
-			query.V_PASSWORD = V_PASSWORD;
+			// query.V_LOGINNAME = V_LOGINNAME;
+			// query.V_PASSWORD = V_PASSWORD;
 			query.device_id = device_id;
 			query.point_code = point_code;
 			
@@ -334,8 +334,8 @@ Ext.onReady(function(){
 		return unchkIcon;
 	}
 	var queryJson = new Object();
-	queryJson.V_LOGINNAME = V_LOGINNAME;
-	queryJson.V_PASSWORD =  V_PASSWORD;
+	// queryJson.V_LOGINNAME = V_LOGINNAME;
+	// queryJson.V_PASSWORD =  V_PASSWORD;
 	queryJson.COMMSTATUS = 'NO';
 	if((company_code!=null)&&(company_code!='null')&&(company_code.length>0))
 		queryJson.company_code = company_code;
@@ -481,8 +481,8 @@ Ext.onReady(function(){
 		        		$("#time_end").val('');
 		        	}
 //	        		query.name = Ext.getCmp('ff_clzt').getValue()==null?"":Ext.getCmp('ff_clzt').getValue();
-	        		query.V_LOGINNAME = V_LOGINNAME;
-	        		query.V_PASSWORD =  V_PASSWORD;
+// 	        		query.V_LOGINNAME = V_LOGINNAME;
+// 	        		query.V_PASSWORD =  V_PASSWORD;
 	        		query.COMMSTATUS = 'NO';
 		        	var jsonstr = Ext.JSON.encode(query);
 		        	myStore.getProxy().extraParams = {

WebRoot/view/efireAlarm/scripts/efireDevice.js

@@ -482,8 +482,8 @@ var draw_cycle_icon = function(icon_id,name, total, num, themecolor){
 
 var getCurrentData = function(){
 	var query = new Object();
-	query.V_LOGINNAME = V_LOGINNAME;
-	query.V_PASSWORD = V_PASSWORD;
+	// query.V_LOGINNAME = V_LOGINNAME;
+	// query.V_PASSWORD = V_PASSWORD;
 	query.dwtype = "7";
 	query.COMMSTATUS = 'ONLY';
 	if((company_code!=null)&&(company_code!='null')&&(company_code.length>0))
@@ -538,7 +538,7 @@ function exportbtn_click(){
 	    fields += '{id:"'+array[i]+'",title:"'+name[i]+'",shown:"'+true+'"}';
 	}
 			var query = new Object();
-			query.V_LOGINNAME = V_LOGINNAME;
+			// query.V_LOGINNAME = V_LOGINNAME;
 			query.company_code = company_code;
 			query.clzt = clzt;
 			query.time_start = time_start;
@@ -587,8 +587,8 @@ Ext.onReady(function(){
 		return unchkIcon;
 	}
 	var queryJson = new Object();
-	queryJson.V_LOGINNAME = V_LOGINNAME;
-	queryJson.V_PASSWORD =  V_PASSWORD;
+	// queryJson.V_LOGINNAME = V_LOGINNAME;
+	// queryJson.V_PASSWORD =  V_PASSWORD;
 	queryJson.COMMSTATUS = 'ONLY';
 	if((company_code!=null)&&(company_code!='null')&&(company_code.length>0))
 		queryJson.company_code = company_code;
@@ -741,8 +741,8 @@ Ext.onReady(function(){
 		        		$("#time_end").val('');
 		        	}
 //	        		query.clzt = Ext.getCmp('ff_clzt').getValue()==null?"":Ext.getCmp('ff_clzt').getValue();
-	        		query.V_LOGINNAME = V_LOGINNAME;
-	        		query.V_PASSWORD =  V_PASSWORD;
+// 	        		query.V_LOGINNAME = V_LOGINNAME;
+// 	        		query.V_PASSWORD =  V_PASSWORD;
 	        		query.COMMSTATUS = 'ONLY';
 		        	var jsonstr = Ext.JSON.encode(query);
 		        	myStore.getProxy().extraParams = {
@@ -897,8 +897,8 @@ Ext.onReady(function(){
 		    	var form = this.up('form').getForm();
 		        if (form.isValid()) {
 		        	var queryJson = new Object();
-		        	queryJson.V_LOGINNAME = V_LOGINNAME;
-		        	queryJson.V_PASSWORD = V_PASSWORD;
+		        	// queryJson.V_LOGINNAME = V_LOGINNAME;
+		        	// queryJson.V_PASSWORD = V_PASSWORD;
 		        	queryJson.id = Ext.getCmp('uf_id').getValue();
 		        	queryJson.status = Ext.getCmp('uf_status').getValue();
 		        	queryJson.name = Ext.getCmp('uf_name').getValue();

WebRoot/view/efireAlarm/scripts/efireOption.js

@@ -482,8 +482,8 @@ var draw_cycle_icon = function(icon_id,name, total, num, themecolor){
 
 var getCurrentData = function(){
 	var query = new Object();
-	query.V_LOGINNAME = V_LOGINNAME;
-	query.V_PASSWORD = V_PASSWORD;
+	// query.V_LOGINNAME = V_LOGINNAME;
+	// query.V_PASSWORD = V_PASSWORD;
 	query.dwtype = '7';
 	query.COMMSTATUS = 'NO';
 	if((company_code!=null)&&(company_code!='null')&&(company_code.length>0))
@@ -538,7 +538,7 @@ function exportbtn_click(){
 	    fields += '{id:"'+array[i]+'",title:"'+name[i]+'",shown:"'+true+'"}';
 	}
 			var query = new Object();
-			query.V_LOGINNAME = V_LOGINNAME;
+			// query.V_LOGINNAME = V_LOGINNAME;
 			query.company_code = company_code;
 			query.clzt = clzt;
 			query.time_start = time_start;
@@ -588,8 +588,8 @@ Ext.onReady(function(){
 		return unchkIcon;
 	}
 	var queryJson = new Object();
-	queryJson.V_LOGINNAME = V_LOGINNAME;
-	queryJson.V_PASSWORD =  V_PASSWORD;
+	// queryJson.V_LOGINNAME = V_LOGINNAME;
+	// queryJson.V_PASSWORD =  V_PASSWORD;
 	queryJson.COMMSTATUS = 'NO';
 	if((company_code!=null)&&(company_code!='null')&&(company_code.length>0))
 		queryJson.company_code = company_code;
@@ -744,8 +744,8 @@ Ext.onReady(function(){
 //	        		query.clzt = Ext.getCmp('ff_clzt').getValue()==null?"":Ext.getCmp('ff_clzt').getValue();
 //	        		query.time_start = Ext.getCmp('ff_start_data').getValue()==null?"":Ext.getCmp('ff_start_data').getValue();
 //	        		query.time_end = Ext.getCmp('ff_end_data').getValue()==null?"":Ext.getCmp('ff_end_data').getValue();
-	        		query.V_LOGINNAME = V_LOGINNAME;
-	        		query.V_PASSWORD =  V_PASSWORD;
+// 	        		query.V_LOGINNAME = V_LOGINNAME;
+// 	        		query.V_PASSWORD =  V_PASSWORD;
 	        		query.COMMSTATUS = 'NO';
 	        		var jsonstr = Ext.JSON.encode(query);
 		        	myStore.getProxy().extraParams = {
@@ -900,8 +900,8 @@ Ext.onReady(function(){
 		    	var form = this.up('form').getForm();
 		        if (form.isValid()) {
 		        	var queryJson = new Object();
-		        	queryJson.V_LOGINNAME = V_LOGINNAME;
-		        	queryJson.V_PASSWORD = V_PASSWORD;
+		        	// queryJson.V_LOGINNAME = V_LOGINNAME;
+		        	// queryJson.V_PASSWORD = V_PASSWORD;
 		        	queryJson.id = Ext.getCmp('uf_id').getValue();
 		        	queryJson.status = Ext.getCmp('uf_status').getValue();
 		        	queryJson.name = Ext.getCmp('uf_name').getValue();

WebRoot/view/efireAnalysis/api/request.js

@@ -24,7 +24,7 @@ function ajaxRequest(path, method, data, success, error, type = 1) {
     let loginUser = {
 
         "V_LOGINNAME": LOGIN_NAME,
-        "V_PASSWORD": LOGIN_PASSWORD,
+        // "V_PASSWORD": LOGIN_PASSWORD,
     }
 
     if (type == 1) { //不传用户名密码

WebRoot/view/efireAnalysis/scripts/projectWoker.js

@@ -16,8 +16,8 @@ Ext.onReady(function(){
 	$("#V_LOGINNAME").val(sessionStorage.getItem('V_LOGINNAME'));
 	$("#V_PASSWORD").val(sessionStorage.getItem('V_PASSWORD'));
 	var queryJson = new Object();
-	queryJson.V_LOGINNAME = $("#V_LOGINNAME").val();
-	queryJson.V_PASSWORD =  $("#V_PASSWORD").val();
+	// queryJson.V_LOGINNAME = $("#V_LOGINNAME").val();
+	// queryJson.V_PASSWORD =  $("#V_PASSWORD").val();
 	var draw_confirm = function(start_data,end_data,project_date){
 		var start_data = start_data;
 		var end_data = end_data;
@@ -1708,8 +1708,8 @@ Ext.onReady(function(){
 		    html:'<div style="overflow-y:auto;height:800px;width:640px;"><div id="woker_talk"></div></div>'
 		}).show();
 		var query = new Object();
-		query.V_LOGINNAME = $("#V_LOGINNAME").val();
-		query.V_PASSWORD = $("#V_PASSWORD").val();
+		// query.V_LOGINNAME = $("#V_LOGINNAME").val();
+		// query.V_PASSWORD = $("#V_PASSWORD").val();
 		query.start_data = start_data;
 		query.end_data = end_data;
 		query.build_code = build_code;

WebRoot/view/fireAlarm/scripts/fireDevice.js

@@ -482,8 +482,8 @@ var draw_cycle_icon = function(icon_id,name, total, num, themecolor){
 
 var getCurrentData = function(){
 	var query = new Object();
-	query.V_LOGINNAME = V_LOGINNAME;
-	query.V_PASSWORD = V_PASSWORD;
+	// query.V_LOGINNAME = V_LOGINNAME;
+	// query.V_PASSWORD = V_PASSWORD;
 	query.dwtype='1';
 	query.COMMSTATUS = 'ONLY';
 	if((company_code!=null)&&(company_code!='null')&&(company_code.length>0))
@@ -538,7 +538,7 @@ function exportbtn_click(){
 	    fields += '{id:"'+array[i]+'",title:"'+name[i]+'",shown:"'+true+'"}';
 	}
 			var query = new Object();
-			query.V_LOGINNAME = V_LOGINNAME;
+			// query.V_LOGINNAME = V_LOGINNAME;
 			query.company_code = company_code;
 			query.clzt = clzt;
 			query.time_start = time_start;
@@ -587,8 +587,8 @@ Ext.onReady(function(){
 		return unchkIcon;
 	}
 	var queryJson = new Object();
-	queryJson.V_LOGINNAME = V_LOGINNAME;
-	queryJson.V_PASSWORD =  V_PASSWORD;
+	// queryJson.V_LOGINNAME = V_LOGINNAME;
+	// queryJson.V_PASSWORD =  V_PASSWORD;
 	queryJson.COMMSTATUS = 'ONLY';
 	if((company_code!=null)&&(company_code!='null')&&(company_code.length>0))
 		queryJson.company_code = company_code;
@@ -741,8 +741,8 @@ Ext.onReady(function(){
 		        		$("#time_end").val('');
 		        	}
 //	        		query.clzt = Ext.getCmp('ff_clzt').getValue()==null?"":Ext.getCmp('ff_clzt').getValue();
-	        		query.V_LOGINNAME = V_LOGINNAME;
-	        		query.V_PASSWORD =  V_PASSWORD;
+// 	        		query.V_LOGINNAME = V_LOGINNAME;
+// 	        		query.V_PASSWORD =  V_PASSWORD;
 	        		query.COMMSTATUS = 'ONLY';
 		        	var jsonstr = Ext.JSON.encode(query);
 		        	myStore.getProxy().extraParams = {
@@ -897,8 +897,8 @@ Ext.onReady(function(){
 		    	var form = this.up('form').getForm();
 		        if (form.isValid()) {
 		        	var queryJson = new Object();
-		        	queryJson.V_LOGINNAME = V_LOGINNAME;
-		        	queryJson.V_PASSWORD = V_PASSWORD;
+		        	// queryJson.V_LOGINNAME = V_LOGINNAME;
+		        	// queryJson.V_PASSWORD = V_PASSWORD;
 		        	queryJson.id = Ext.getCmp('uf_id').getValue();
 		        	queryJson.status = Ext.getCmp('uf_status').getValue();
 		        	queryJson.name = Ext.getCmp('uf_name').getValue();

WebRoot/view/fireAlarm/scripts/fireOption.js

@@ -484,8 +484,8 @@ var draw_cycle_icon = function(icon_id,name, total, num, themecolor){
 
 var getCurrentData = function(){
 	var query = new Object();
-	query.V_LOGINNAME = V_LOGINNAME;
-	query.V_PASSWORD = V_PASSWORD;
+	// query.V_LOGINNAME = V_LOGINNAME;
+	// query.V_PASSWORD = V_PASSWORD;
 	query.dwtype='1';
 	query.COMMSTATUS = 'NO';
 	if((company_code!=null)&&(company_code!='null')&&(company_code.length>0))
@@ -539,7 +539,7 @@ function exportbtn_click(){
 	    fields += '{id:"'+array[i]+'",title:"'+name[i]+'",shown:"'+true+'"}';
 	}
 			var query = new Object();
-			query.V_LOGINNAME = V_LOGINNAME;
+			// query.V_LOGINNAME = V_LOGINNAME;
 			query.company_code = company_code;
 			query.clzt = clzt;
 			query.time_start = time_start;
@@ -588,8 +588,8 @@ Ext.onReady(function(){
 		return unchkIcon;
 	}
 	var queryJson = new Object();
-	queryJson.V_LOGINNAME = V_LOGINNAME;
-	queryJson.V_PASSWORD =  V_PASSWORD;
+	// queryJson.V_LOGINNAME = V_LOGINNAME;
+	// queryJson.V_PASSWORD =  V_PASSWORD;
 	queryJson.COMMSTATUS = 'NO';
 	if((company_code!=null)&&(company_code!='null')&&(company_code.length>0))
 		queryJson.company_code = company_code;
@@ -748,8 +748,8 @@ Ext.onReady(function(){
 //	        		query.clzt = Ext.getCmp('ff_clzt').getValue()==null?"":Ext.getCmp('ff_clzt').getValue();
 //	        		query.time_start = Ext.getCmp('ff_start_data').getValue()==null?"":Ext.getCmp('ff_start_data').getValue();
 //	        		query.time_end = Ext.getCmp('ff_end_data').getValue()==null?"":Ext.getCmp('ff_end_data').getValue();
-	        		query.V_LOGINNAME = V_LOGINNAME;
-	        		query.V_PASSWORD =  V_PASSWORD;
+// 	        		query.V_LOGINNAME = V_LOGINNAME;
+// 	        		query.V_PASSWORD =  V_PASSWORD;
 	        		query.COMMSTATUS = 'NO';
 		        	var jsonstr = Ext.JSON.encode(query);
 		        	myStore.getProxy().extraParams = {
@@ -916,8 +916,8 @@ Ext.onReady(function(){
 		    	var form = this.up('form').getForm();
 		        if (form.isValid()) {
 		        	var queryJson = new Object();
-		        	queryJson.V_LOGINNAME = V_LOGINNAME;
-		        	queryJson.V_PASSWORD = V_PASSWORD;
+		        	// queryJson.V_LOGINNAME = V_LOGINNAME;
+		        	// queryJson.V_PASSWORD = V_PASSWORD;
 		        	queryJson.id = Ext.getCmp('uf_id').getValue();
 		        	queryJson.status = Ext.getCmp('uf_status').getValue();
 		        	queryJson.name = Ext.getCmp('uf_name').getValue();

WebRoot/view/frontpage/scripts/company.js

@@ -1037,7 +1037,7 @@ var icon_click = function (obj) {
     var query = new Object();
     query.dwtype = dwtype;
     query.level = level;
-    query.V_LOGINNAME = V_LOGINNAME;
+    // query.V_LOGINNAME = V_LOGINNAME;
     query.COMPANY_CODE = company_code;
     $.ajax({
         type: 'POST',
@@ -1953,8 +1953,8 @@ var show_userinfo_detail = function (devId) {
             text: '查岗',
             handler: function () {
                 var query = new Object();
-                query.V_LOGINNAME = V_LOGINNAME;
-                query.V_PASSWORD = V_PASSWORD;
+                // query.V_LOGINNAME = V_LOGINNAME;
+                // query.V_PASSWORD = V_PASSWORD;
                 query.DEVICE_ID = devId;
                 query.CMD = 91;
                 query.LIMIT = 10;
@@ -2498,8 +2498,8 @@ var show_alarm_info = function (dwtype, status, id, name, device_code, company_c
 
 var getCompanyInfo = function () {
     var query = new Object();
-    query.V_LOGINNAME = V_LOGINNAME;
-    query.V_PASSWORD = V_PASSWORD;
+    // query.V_LOGINNAME = V_LOGINNAME;
+    // query.V_PASSWORD = V_PASSWORD;
     query.COMPANY_CODE = company_code;
     query.COMMSTATUS = "NO";
     var qdata = 'queryJson=' + Ext.JSON.encode(query);
@@ -2556,8 +2556,8 @@ Ext.onReady(function () {
         ]
     });
     var qobj = new Object();
-    qobj.V_LOGINNAME = $("#V_LOGINNAME").val();
-    qobj.V_PASSWORD = $("#V_PASSWORD").val();
+    // qobj.V_LOGINNAME = $("#V_LOGINNAME").val();
+    // qobj.V_PASSWORD = $("#V_PASSWORD").val();
 
     var CompanyStory = Ext.create('Ext.data.Store', {
         model: 'CompanyComboStore1',
@@ -2799,10 +2799,9 @@ Ext.onReady(function () {
                 var form = this.up('form').getForm();
                 if (form.isValid()) {
                     var queryJson = new Object();
-                    queryJson.V_LOGINNAME = V_LOGINNAME;
-                    queryJson.V_PASSWORD = V_PASSWORD;
-                    queryJson.dwtype = Ext.getCmp('uf_dwtype').getValue();
-                    ;
+                    // queryJson.V_LOGINNAME = V_LOGINNAME;
+                    // queryJson.V_PASSWORD = V_PASSWORD;
+                    queryJson.dwtype = Ext.getCmp('uf_dwtype').getValue();;
                     queryJson.id = Ext.getCmp('uf_id').getValue();
                     queryJson.status = Ext.getCmp('uf_status').getValue();
                     queryJson.name = Ext.getCmp('uf_name').getValue();

WebRoot/view/frontpage/scripts/mainframe.js

@@ -1021,8 +1021,8 @@ var menuUser = Ext.create('Ext.menu.Menu',{
         iconCls: 'user_logout_btn',
         handler: function(){
         	var query = new Object();
-        	query.V_LOGINNAME = V_LOGINNAME;
-        	query.V_PASSWORD = V_PASSWORD;
+        	// query.V_LOGINNAME = V_LOGINNAME;
+        	// query.V_PASSWORD = V_PASSWORD;
         	$.ajax({
                 type:'POST',
                 url: baseUrl+'iot/admin/logout',

WebRoot/view/frontpage/scripts/map.js

@@ -628,8 +628,8 @@ var update_companyList = function() {
     show_list_cur = 0;
     if ($("#search_company").val().length > 0) {
         var query = new Object();
-        query.V_LOGINNAME = V_LOGINNAME;
-        query.V_PASSWORD = V_PASSWORD;
+        // query.V_LOGINNAME = V_LOGINNAME;
+        // query.V_PASSWORD = V_PASSWORD;
         query.V_COMPANY_NAME = $("#search_company").val();
         $.ajax({
             type: 'POST',
@@ -767,8 +767,8 @@ var showBuilding = function(company_code) {
 
                 if (V_LOGINNAME == 'ypxy') {
                     var query = new Object();
-                    query.V_LOGINNAME = V_LOGINNAME;
-                    query.V_PASSWORD = V_PASSWORD;
+                    // query.V_LOGINNAME = V_LOGINNAME;
+                    // query.V_PASSWORD = V_PASSWORD;
                     query.dwtype = '2';
                     query.COMMSTATUS = 'NO';
                     if ((company_code != null) && (company_code != 'null') && (company_code.length > 0))
@@ -950,8 +950,8 @@ var clear_detail_info = function() {
 
         if (V_LOGINNAME == 'ypxy') {
             var query = new Object();
-            query.V_LOGINNAME = V_LOGINNAME;
-            query.V_PASSWORD = V_PASSWORD;
+            // query.V_LOGINNAME = V_LOGINNAME;
+            // query.V_PASSWORD = V_PASSWORD;
             query.dwtype = '2';
             query.COMMSTATUS = 'NO';
             if ((company_code != null) && (company_code != 'null') && (company_code.length > 0))
@@ -1140,8 +1140,7 @@ var showInfo = function(e) {
             clear_detail_info();
             current_company_code = company_code;
             var qobj = new Object();
-            qobj.V_LOGINNAME = $("#V_LOGINNAME").val();
-            qobj.V_PASSWORD = $("#V_PASSWORD").val();
+            qobj.V_LOGINNAME = $("#V_LOGINNAME").val();qobj.V_PASSWORD = $("#V_PASSWORD").val();
             qobj.V_COMPANYID = company_code;
             qobj.I_COMMAND = 4;
             var qdata = "queryJson=" + JSON.stringify(qobj);
@@ -1276,8 +1275,8 @@ var showInfo = function(e) {
 
             if (V_LOGINNAME == 'ypxy') {
                 var query = new Object();
-                query.V_LOGINNAME = V_LOGINNAME;
-                query.V_PASSWORD = V_PASSWORD;
+                // query.V_LOGINNAME = V_LOGINNAME;
+                // query.V_PASSWORD = V_PASSWORD;
                 query.dwtype = '2';
                 query.COMMSTATUS = 'NO';
                 if ((company_code != null) && (company_code != 'null') && (company_code.length > 0))
@@ -1717,8 +1716,8 @@ var draw_all = function() {
         draw_pie('data_pie_3', d2a, d2ac);
         if (V_LOGINNAME == 'ypxy') {
             var query = new Object();
-            query.V_LOGINNAME = V_LOGINNAME;
-            query.V_PASSWORD = V_PASSWORD;
+            // query.V_LOGINNAME = V_LOGINNAME;
+            // query.V_PASSWORD = V_PASSWORD;
             query.dwtype = '2';
             query.COMMSTATUS = 'NO';
             if ((company_code != null) && (company_code != 'null') && (company_code.length > 0))

WebRoot/view/frontpage/scripts/query.js

@@ -71,7 +71,7 @@ Ext.onReady(function(){
 	queryJson.level = level;
 	queryJson.objid = objid;
 	queryJson.company_code = company_code;
-	queryJson.V_LOGINNAME = V_LOGINNAME;
+	// queryJson.V_LOGINNAME = V_LOGINNAME;
 	myStore = Ext.create('Ext.data.Store', {
 	    model: 'queryOption',
 	    pageSize: 5, 

WebRoot/view/inspectionrecord/scripts/inspectionrecord.js

@@ -64,8 +64,8 @@ function exportbtn_click(){
 	    fields += '{id:"'+array[i]+'",title:"'+excelname[i]+'",shown:"'+true+'"}';
 	}
 			var query = new Object();
-			query.V_LOGINNAME = V_LOGINNAME;
-			query.V_PASSWORD = V_PASSWORD;
+			// query.V_LOGINNAME = V_LOGINNAME;
+			// query.V_PASSWORD = V_PASSWORD;
 			query.xj_name = xj_name;
 			query.equipment_id = equipment_id;
 			query.route_name = route_name;
@@ -118,8 +118,8 @@ Ext.onReady(function(){
 		return unchkIcon;
 	}
 	var queryJson = new Object();
-	queryJson.V_LOGINNAME = V_LOGINNAME;
-	queryJson.V_PASSWORD =  V_PASSWORD;
+	// queryJson.V_LOGINNAME = V_LOGINNAME;
+	// queryJson.V_PASSWORD =  V_PASSWORD;
 //	queryJson.COMMSTATUS = 'NO';
 	if((company_code!=null)&&(company_code!='null')&&(company_code.length>0))
 		queryJson.company_code = company_code;

WebRoot/view/inspectors/scripts/inspectors.js

@@ -100,8 +100,8 @@ function exportbtn_click(){
 	    fields += '{id:"'+array[i]+'",title:"'+excelname[i]+'",shown:"'+true+'"}';
 	}
 			var query = new Object();
-			query.V_LOGINNAME = V_LOGINNAME;
-			query.V_PASSWORD = V_PASSWORD;
+			// query.V_LOGINNAME = V_LOGINNAME;
+			// query.V_PASSWORD = V_PASSWORD;
 			query.name = name;
 			query.zn = zn;
 			query.EXPORT_FILE = '维保人列表';
@@ -163,8 +163,8 @@ Ext.onReady(function(){
 	}
 	
 	var queryJson = new Object();
-	queryJson.V_LOGINNAME = V_LOGINNAME;
-	queryJson.V_PASSWORD =  V_PASSWORD;
+	// queryJson.V_LOGINNAME = V_LOGINNAME;
+	// queryJson.V_PASSWORD =  V_PASSWORD;
 //	queryJson.COMMSTATUS = 'NO';
 	if((company_code!=null)&&(company_code!='null')&&(company_code.length>0))
 		queryJson.company_code = company_code;
@@ -357,7 +357,7 @@ Ext.onReady(function(){
         			Inspectiontime +=parseInt(item.inputValue);
           });
         		var query = new Object();
-        		query.V_LOGINNAME = V_LOGINNAME;
+        		// query.V_LOGINNAME = V_LOGINNAME;
         		query.zn=Inspectiontime;
         		query.name = Ext.getCmp('fa_Inspectors_name').getValue();
         		query.phone = Ext.getCmp('fa_Inspectors_phone').getValue();
@@ -436,7 +436,7 @@ Ext.onReady(function(){
 		        var form = this.up('form').getForm();
 		        if (form.isValid()) {
 		        	var query = new Object();
-		        	query.V_LOGINNAME = $("#V_LOGINNAME").val();
+		        	// query.V_LOGINNAME = $("#V_LOGINNAME").val();
 		        	query.team_name = Ext.getCmp('fa_Inspectors_team_name').getValue();
 		        	query.person_liable_id = Ext.getCmp('fa_Inspectors_person_liable_id').getValue();
 		        	var jsonstr = Ext.JSON.encode(query);
@@ -828,8 +828,8 @@ Ext.onReady(function(){
 		query.name = maintenancePerson_title3_input;
 		$("#name").val(maintenancePerson_title3_input);
 		}
-		query.V_LOGINNAME = V_LOGINNAME;
-		query.V_PASSWORD =  V_PASSWORD;
+		// query.V_LOGINNAME = V_LOGINNAME;
+		// query.V_PASSWORD =  V_PASSWORD;
 		var jsonstr = Ext.JSON.encode(query);
     	myStore.getProxy().extraParams = {
     		queryJson : jsonstr
@@ -847,8 +847,8 @@ Ext.onReady(function(){
 		if(maintenancePerson_title31_input.length>0){
 		query.name = maintenancePerson_title31_input;
 		}
-		query.V_LOGINNAME = V_LOGINNAME;
-		query.V_PASSWORD =  V_PASSWORD;
+		// query.V_LOGINNAME = V_LOGINNAME;
+		// query.V_PASSWORD =  V_PASSWORD;
 		var jsonstr = Ext.JSON.encode(query);
     	myStore.getProxy().extraParams = {
     		queryJson : jsonstr
@@ -1045,8 +1045,8 @@ Ext.onReady(function(){
 		  var query = new Object(); 
 		    query.id = stor1_id;
 		    
-		    query.V_LOGINNAME = V_LOGINNAME;
-		    query.V_PASSWORD =  V_PASSWORD;
+		    // query.V_LOGINNAME = V_LOGINNAME;
+		    // query.V_PASSWORD =  V_PASSWORD;
 		    var jsonstr = Ext.JSON.encode(query);
 		       myStore1.getProxy().extraParams = {
 		        queryJson : jsonstr
@@ -1158,8 +1158,8 @@ Ext.onReady(function(){
 	    query.xid = xid;
 	  }
 	  query.id = id;
-	  query.V_LOGINNAME = V_LOGINNAME;
-	  query.V_PASSWORD =  V_PASSWORD;
+	  // query.V_LOGINNAME = V_LOGINNAME;
+	  // query.V_PASSWORD =  V_PASSWORD;
 	  var jsonstr = Ext.JSON.encode(query);
 	     myStore1.getProxy().extraParams = {
 	      queryJson : jsonstr
@@ -1294,7 +1294,7 @@ Ext.onReady(function(){
 	
 	var childPanel3_fun =function(){
 		  var query = new Object();
-		  query.V_LOGINNAME = $("#V_LOGINNAME").val();
+		  // query.V_LOGINNAME = $("#V_LOGINNAME").val();
 		  $.ajax({
 		         type:'POST',
 		         url: baseUrl+"iot/inspectorsx/getTeamMembersList1xj",
@@ -1408,8 +1408,8 @@ Ext.onReady(function(){
 	         if(label1.length>0){
 	           query.id = label1;
 	         }
-	         query.V_LOGINNAME = V_LOGINNAME;
-	         query.V_PASSWORD =  V_PASSWORD;
+	         // query.V_LOGINNAME = V_LOGINNAME;
+	         // query.V_PASSWORD =  V_PASSWORD;
 	         var jsonstr = Ext.JSON.encode(query);
 	            myStore1.getProxy().extraParams = {
 	             queryJson : jsonstr

WebRoot/view/liftAlarm/scripts/liftDevice.js

@@ -483,8 +483,8 @@ var draw_cycle_icon = function(icon_id,name, total, num, themecolor){
 
 var getCurrentData = function(){
 	var query = new Object();
-	query.V_LOGINNAME = V_LOGINNAME;
-	query.V_PASSWORD = V_PASSWORD;
+	// query.V_LOGINNAME = V_LOGINNAME;
+	// query.V_PASSWORD = V_PASSWORD;
 	query.dwtype='17';
 	query.COMMSTATUS = 'ONLY';
 	if((company_code!=null)&&(company_code!='null')&&(company_code.length>0))
@@ -539,7 +539,7 @@ function exportbtn_click(){
 	    fields += '{id:"'+array[i]+'",title:"'+name[i]+'",shown:"'+true+'"}';
 	}
 			var query = new Object();
-			query.V_LOGINNAME = V_LOGINNAME;
+			// query.V_LOGINNAME = V_LOGINNAME;
 			query.company_code = company_code;
 			query.clzt = clzt;
 			query.time_start = time_start;
@@ -588,8 +588,8 @@ Ext.onReady(function(){
 		return unchkIcon;
 	}
 	var queryJson = new Object();
-	queryJson.V_LOGINNAME = V_LOGINNAME;
-	queryJson.V_PASSWORD =  V_PASSWORD;
+	// queryJson.V_LOGINNAME = V_LOGINNAME;
+	// queryJson.V_PASSWORD =  V_PASSWORD;
 	queryJson.COMMSTATUS = 'ONLY';
 	if((company_code!=null)&&(company_code!='null')&&(company_code.length>0))
 		queryJson.company_code = company_code;
@@ -742,8 +742,8 @@ Ext.onReady(function(){
 		        		$("#time_end").val('');
 		        	}
 //	        		query.clzt = Ext.getCmp('ff_clzt').getValue()==null?"":Ext.getCmp('ff_clzt').getValue();
-	        		query.V_LOGINNAME = V_LOGINNAME;
-	        		query.V_PASSWORD =  V_PASSWORD;
+// 	        		query.V_LOGINNAME = V_LOGINNAME;
+// 	        		query.V_PASSWORD =  V_PASSWORD;
 	        		query.COMMSTATUS = 'ONLY';
 		        	var jsonstr = Ext.JSON.encode(query);
 		        	myStore.getProxy().extraParams = {
@@ -907,8 +907,8 @@ Ext.onReady(function(){
 		    	var form = this.up('form').getForm();
 		        if (form.isValid()) {
 		        	var queryJson = new Object();
-		        	queryJson.V_LOGINNAME = V_LOGINNAME;
-		        	queryJson.V_PASSWORD = V_PASSWORD;
+		        	// queryJson.V_LOGINNAME = V_LOGINNAME;
+		        	// queryJson.V_PASSWORD = V_PASSWORD;
 		        	queryJson.id = Ext.getCmp('uf_id').getValue();
 		        	queryJson.status = Ext.getCmp('uf_status').getValue();
 		        	 

WebRoot/view/liftAlarm/scripts/liftOption.js

@@ -493,8 +493,8 @@ var draw_cycle_icon = function(icon_id,name, total, num, themecolor){
 
 var getCurrentData = function(){
 	var query = new Object();
-	query.V_LOGINNAME = V_LOGINNAME;
-	query.V_PASSWORD = V_PASSWORD;
+	// query.V_LOGINNAME = V_LOGINNAME;
+	// query.V_PASSWORD = V_PASSWORD;
 	query.dwtype='17';
 	query.COMMSTATUS = 'NO';
 	if((company_code!=null)&&(company_code!='null')&&(company_code.length>0))
@@ -549,7 +549,7 @@ function exportbtn_click(){
 	    fields += '{id:"'+array[i]+'",title:"'+name[i]+'",shown:"'+true+'"}';
 	}
 			var query = new Object();
-			query.V_LOGINNAME = V_LOGINNAME;
+			// query.V_LOGINNAME = V_LOGINNAME;
 			query.company_code = company_code;
 			query.clzt = clzt;
 			query.time_start = time_start;
@@ -598,8 +598,8 @@ Ext.onReady(function(){
 		return unchkIcon;
 	}
 	var queryJson = new Object();
-	queryJson.V_LOGINNAME = V_LOGINNAME;
-	queryJson.V_PASSWORD =  V_PASSWORD;
+	// queryJson.V_LOGINNAME = V_LOGINNAME;
+	// queryJson.V_PASSWORD =  V_PASSWORD;
 	queryJson.COMMSTATUS = 'NO';
 	if((company_code!=null)&&(company_code!='null')&&(company_code.length>0))
 		queryJson.company_code = company_code;
@@ -758,8 +758,8 @@ Ext.onReady(function(){
 //	        		query.clzt = Ext.getCmp('ff_clzt').getValue()==null?"":Ext.getCmp('ff_clzt').getValue();
 //	        		query.time_start = Ext.getCmp('ff_start_data').getValue()==null?"":Ext.getCmp('ff_start_data').getValue();
 //	        		query.time_end = Ext.getCmp('ff_end_data').getValue()==null?"":Ext.getCmp('ff_end_data').getValue();
-	        		query.V_LOGINNAME = V_LOGINNAME;
-	        		query.V_PASSWORD =  V_PASSWORD;
+// 	        		query.V_LOGINNAME = V_LOGINNAME;
+// 	        		query.V_PASSWORD =  V_PASSWORD;
 	        		query.COMMSTATUS = 'NO';
 		        	var jsonstr = Ext.JSON.encode(query);
 		        	myStore.getProxy().extraParams = {
@@ -935,8 +935,8 @@ Ext.onReady(function(){
 		    	var form = this.up('form').getForm();
 		        if (form.isValid()) {
 		        	var queryJson = new Object();
-		        	queryJson.V_LOGINNAME = V_LOGINNAME;
-		        	queryJson.V_PASSWORD = V_PASSWORD;
+		        	// queryJson.V_LOGINNAME = V_LOGINNAME;
+		        	// queryJson.V_PASSWORD = V_PASSWORD;
 		        	queryJson.id = Ext.getCmp('uf_id').getValue();
 		        	queryJson.status = Ext.getCmp('uf_status').getValue();
 		        	queryJson.name = Ext.getCmp('uf_name').getValue();

WebRoot/view/maintenance/scripts/maintenance.js

@@ -50,8 +50,8 @@ Ext.define('Maintenance',{
 
 function exportbtn_click(){
 	baseUrl = document.getElementById('basePath').value;
-	V_LOGINNAME = $("#V_LOGINNAME").val();
-	V_PASSWORD = $("#V_PASSWORD").val();
+	// V_LOGINNAME = $("#V_LOGINNAME").val();
+	// V_PASSWORD = $("#V_PASSWORD").val();
 	spot_name = document.getElementById('spot_name').value;
 	spot_address = document.getElementById('spot_address').value;
 	var fields = '';
@@ -63,8 +63,8 @@ function exportbtn_click(){
 	    fields += '{id:"'+array[i]+'",title:"'+excelname[i]+'",shown:"'+true+'"}';
 	}
 			var query = new Object();
-			query.V_LOGINNAME = V_LOGINNAME;
-			query.V_PASSWORD = V_PASSWORD;
+			// query.V_LOGINNAME = V_LOGINNAME;
+			// query.V_PASSWORD = V_PASSWORD;
 			query.spot_name = spot_name;
 			query.spot_address = spot_address;
 			query.EXPORT_FILE = '维保点位列表';
@@ -169,8 +169,8 @@ Ext.onReady(function(){
 	}
 	
 	var queryJson = new Object();
-	queryJson.V_LOGINNAME = V_LOGINNAME;
-	queryJson.V_PASSWORD =  V_PASSWORD;
+	// queryJson.V_LOGINNAME = V_LOGINNAME;
+	// queryJson.V_PASSWORD =  V_PASSWORD;
 //	queryJson.COMMSTATUS = 'NO';
 	if((company_code!=null)&&(company_code!='null')&&(company_code.length>0))
 		queryJson.company_code = company_code;
@@ -551,8 +551,8 @@ Ext.onReady(function(){
 	        		query.spot_type = fm_spot_type;
 	        		query.remarks = fm_message;
 	        		query.picture_route = uploadURL;
-	        		query.V_LOGINNAME = V_LOGINNAME;
-		        	query.V_PASSWORD =  V_PASSWORD;
+	        		// query.V_LOGINNAME = V_LOGINNAME;
+		        	// query.V_PASSWORD =  V_PASSWORD;
 		        	var jsonstr = Ext.JSON.encode(query);
 		        	Ext.getCmp('fm_queryJson').setValue(jsonstr);
 	        		Ext.getCmp('uploadForm').submit({
@@ -615,8 +615,8 @@ Ext.onReady(function(){
 	        		query.spot_type = fa_spot_type;
 	        		query.remarks = fa_message;
 	        		query.picture_route = addURL;
-	        		query.V_LOGINNAME = V_LOGINNAME;
-		        	query.V_PASSWORD =  V_PASSWORD;
+	        		// query.V_LOGINNAME = V_LOGINNAME;
+		        	// query.V_PASSWORD =  V_PASSWORD;
 		        	var jsonstr = Ext.JSON.encode(query);
 		        	Ext.getCmp('fa_queryJson').setValue(jsonstr);
 		        	Ext.getCmp('addForm').submit({
@@ -816,8 +816,8 @@ Ext.onReady(function(){
 		query.spot_address = maintenance_title3_input1;
 		$("#spot_address").val(maintenance_title3_input1);
 		}
-		query.V_LOGINNAME = V_LOGINNAME;
-		query.V_PASSWORD =  V_PASSWORD;
+		// query.V_LOGINNAME = V_LOGINNAME;
+		// query.V_PASSWORD =  V_PASSWORD;
 		var jsonstr = Ext.JSON.encode(query);
     	myStore.getProxy().extraParams = {
     		queryJson : jsonstr
@@ -1076,8 +1076,8 @@ Ext.onReady(function(){
 		    html:'<div id="maintenance_look_label"></div>'
 		}).show();
 		var query = new Object();
-		query.V_LOGINNAME = $("#V_LOGINNAME").val();
-		query.V_PASSWORD = $("#V_PASSWORD").val();
+		// query.V_LOGINNAME = $("#V_LOGINNAME").val();
+		// query.V_PASSWORD = $("#V_PASSWORD").val();
 		query.id = spot_id;
 		$.ajax({
 	        type:'POST',
@@ -1130,8 +1130,8 @@ Ext.onReady(function(){
 		    html:'<div id="maintenance_look_device"></div>'
 		}).show();
 		var query = new Object();
-		query.V_LOGINNAME = $("#V_LOGINNAME").val();
-		query.V_PASSWORD = $("#V_PASSWORD").val();
+		// query.V_LOGINNAME = $("#V_LOGINNAME").val();
+		// query.V_PASSWORD = $("#V_PASSWORD").val();
 		query.id = spot_id;
 		$.ajax({
 	        type:'POST',

WebRoot/view/maintenanceperson/scripts/maintenanceperson.js

@@ -100,8 +100,8 @@ function exportbtn_click(){
 	    fields += '{id:"'+array[i]+'",title:"'+excelname[i]+'",shown:"'+true+'"}';
 	}
 			var query = new Object();
-			query.V_LOGINNAME = V_LOGINNAME;
-			query.V_PASSWORD = V_PASSWORD;
+			// query.V_LOGINNAME = V_LOGINNAME;
+			// query.V_PASSWORD = V_PASSWORD;
 			query.name = name;
 			query.zn = zn;
 			query.EXPORT_FILE = '维保人列表';
@@ -168,8 +168,8 @@ Ext.onReady(function(){
 	}
 	
 	var queryJson = new Object();
-	queryJson.V_LOGINNAME = V_LOGINNAME;
-	queryJson.V_PASSWORD =  V_PASSWORD;
+	// queryJson.V_LOGINNAME = V_LOGINNAME;
+	// queryJson.V_PASSWORD =  V_PASSWORD;
 //	queryJson.COMMSTATUS = 'NO';
 	if((company_code!=null)&&(company_code!='null')&&(company_code.length>0))
 		queryJson.company_code = company_code;	
@@ -382,7 +382,7 @@ Ext.onReady(function(){
         			Inspectiontime +=parseInt(item.inputValue);
                 });
         		var query = new Object();
-        		query.V_LOGINNAME = V_LOGINNAME;
+        		// query.V_LOGINNAME = V_LOGINNAME;
         		query.zn=Inspectiontime;
         		query.name = Ext.getCmp('fa_name').getValue();
         		query.phone = Ext.getCmp('fa_phone').getValue();
@@ -489,7 +489,7 @@ Ext.onReady(function(){
 		        var form = this.up('form').getForm();
 		        if (form.isValid()) {
 		        	var query = new Object();
-		        	query.V_LOGINNAME = $("#V_LOGINNAME").val();
+		        	// query.V_LOGINNAME = $("#V_LOGINNAME").val();
 		        	query.team_name = Ext.getCmp('fa_team_name').getValue();
 		        	query.person_liable_id = Ext.getCmp('fa_person_liable_id').getValue();
 		        	var jsonstr = Ext.JSON.encode(query);
@@ -882,8 +882,8 @@ Ext.onReady(function(){
 		query.name = maintenancePerson_title3_input;
 		$("#name").val(maintenancePerson_title3_input);
 		}
-		query.V_LOGINNAME = V_LOGINNAME;
-		query.V_PASSWORD =  V_PASSWORD;
+		// query.V_LOGINNAME = V_LOGINNAME;
+		// query.V_PASSWORD =  V_PASSWORD;
 		var jsonstr = Ext.JSON.encode(query);
     	myStore.getProxy().extraParams = {
     		queryJson : jsonstr
@@ -901,8 +901,8 @@ Ext.onReady(function(){
 		if(maintenancePerson_title31_input.length>0){
 		query.name = maintenancePerson_title31_input;
 		}
-		query.V_LOGINNAME = V_LOGINNAME;
-		query.V_PASSWORD =  V_PASSWORD;
+		// query.V_LOGINNAME = V_LOGINNAME;
+		// query.V_PASSWORD =  V_PASSWORD;
 		var jsonstr = Ext.JSON.encode(query);
     	myStore.getProxy().extraParams = {
     		queryJson : jsonstr
@@ -1100,8 +1100,8 @@ Ext.onReady(function(){
 		  var query = new Object(); 
 		    query.id = stor1_id;
 		    
-		    query.V_LOGINNAME = V_LOGINNAME;
-		    query.V_PASSWORD =  V_PASSWORD;
+		    // query.V_LOGINNAME = V_LOGINNAME;
+		    // query.V_PASSWORD =  V_PASSWORD;
 		    var jsonstr = Ext.JSON.encode(query);
 		       myStore1.getProxy().extraParams = {
 		        queryJson : jsonstr
@@ -1218,8 +1218,8 @@ Ext.onReady(function(){
 	    query.xid = xid;
 	  }
 	  query.id = id;
-	  query.V_LOGINNAME = V_LOGINNAME;
-	  query.V_PASSWORD =  V_PASSWORD;
+	  // query.V_LOGINNAME = V_LOGINNAME;
+	  // query.V_PASSWORD =  V_PASSWORD;
 	  var jsonstr = Ext.JSON.encode(query);
 	     myStore1.getProxy().extraParams = {
 	      queryJson : jsonstr
@@ -1306,7 +1306,7 @@ var childPanel3 = function(){
 
 var childPanel3_fun =function(){
 	  var query = new Object();
-	  query.V_LOGINNAME = $("#V_LOGINNAME").val();
+	  // query.V_LOGINNAME = $("#V_LOGINNAME").val();
 	  $.ajax({
 	         type:'POST',
 	         url: baseUrl+"iot/inspectorsx/getTeamMembersList1",
@@ -1396,8 +1396,8 @@ var childPanel3_fun =function(){
 	         if(label1.length>0){
 	           query.id = label1;
 	         }
-	         query.V_LOGINNAME = V_LOGINNAME;
-	         query.V_PASSWORD =  V_PASSWORD;
+	         // query.V_LOGINNAME = V_LOGINNAME;
+	         // query.V_PASSWORD =  V_PASSWORD;
 	         var jsonstr = Ext.JSON.encode(query);
 	            myStore1.getProxy().extraParams = {
 	             queryJson : jsonstr

WebRoot/view/maintenanceplan/scripts/maintenanceplan.js

@@ -72,8 +72,8 @@ function exportbtn_click(){
 	    fields += '{id:"'+array[i]+'",title:"'+name[i]+'",shown:"'+true+'"}';
 	}
 			var query = new Object();
-			query.V_LOGINNAME = V_LOGINNAME;
-			query.plan_name = plan_name;
+			// query.V_LOGINNAME = V_LOGINNAME;
+			// query.plan_name = plan_name;
 			query.person_liable_id = person_liable_id;
 			query.EXPORT_FILE = '维保计划列表';
 			query.fields = '['+fields+']';
@@ -182,8 +182,8 @@ Ext.onReady(function(){
 		Ext.getCmp('MaintenancePlanListPageToolbar').getStore().reload();
 	}
 	var queryJson = new Object();
-	queryJson.V_LOGINNAME = V_LOGINNAME;
-	queryJson.V_PASSWORD =  V_PASSWORD;
+	// queryJson.V_LOGINNAME = V_LOGINNAME;
+	// queryJson.V_PASSWORD =  V_PASSWORD;
 	queryJson.COMMSTATUS = 'NO';
 	if((company_code!=null)&&(company_code!='null')&&(company_code.length>0))
 		queryJson.company_code = company_code;	
@@ -362,8 +362,8 @@ Ext.onReady(function(){
           			        	var label= this.value;
           			 			var query = new Object();
           			     		query.company_code = label;
-          			     		query.V_LOGINNAME = V_LOGINNAME;
-          			     		query.V_PASSWORD =  V_PASSWORD;
+          			     		// query.V_LOGINNAME = V_LOGINNAME;
+          			     		// query.V_PASSWORD =  V_PASSWORD;
           			     		var jsonstr = Ext.JSON.encode(query);
           			         	myStore1.getProxy().extraParams = {
           			         		queryJson : jsonstr
@@ -475,8 +475,8 @@ Ext.onReady(function(){
 	var appendwin = function(){
 		AllSelectedRecords = [];
 		 var query = new Object();
-		  query.V_LOGINNAME=V_LOGINNAME;
-		  query.V_PASSWORD=V_PASSWORD;
+		  // query.V_LOGINNAME=V_LOGINNAME;
+		  // query.V_PASSWORD=V_PASSWORD;
 		  var jsonstr = Ext.JSON.encode(query);
 		     myStore1.getProxy().extraParams = {
 		      queryJson : jsonstr
@@ -520,7 +520,7 @@ Ext.onReady(function(){
 						query.start_date = Ext.util.Format.date(Ext.getCmp('fa_start_date').getValue(), 'Y-m-d');
 						query.end_date = Ext.util.Format.date(Ext.getCmp('fa_end_date').getValue(), 'Y-m-d');
 						
-						query.V_LOGINNAME = V_LOGINNAME;
+						// query.V_LOGINNAME = V_LOGINNAME;
 			               var jsonstr= Ext.JSON.encode(query); 
 			               Ext.Ajax.request( { 
 //			                       timeout : 3000000, 
@@ -570,7 +570,7 @@ Ext.onReady(function(){
 							query.start_date = Ext.util.Format.date(Ext.getCmp('fa_start_date').getValue(), 'Y-m-d');
 							query.end_date = Ext.util.Format.date(Ext.getCmp('fa_end_date').getValue(), 'Y-m-d');
 //							query.ID_LIST = list;
-							query.V_LOGINNAME = V_LOGINNAME;
+// 							query.V_LOGINNAME = V_LOGINNAME;
 							var jsonstr= Ext.JSON.encode(query);
 			                Ext.Ajax.request( { 
 			                        timeout : 3000000, 
@@ -719,8 +719,8 @@ Ext.onReady(function(){
 		query.person_liable_id = maintenancePlan_title3_input1;
 		$("#person_liable_id").val(maintenancePlan_title3_input1);
 		}
-		query.V_LOGINNAME = V_LOGINNAME;
-		query.V_PASSWORD =  V_PASSWORD;
+		// query.V_LOGINNAME = V_LOGINNAME;
+		// query.V_PASSWORD =  V_PASSWORD;
 		var jsonstr = Ext.JSON.encode(query);
     	myStore.getProxy().extraParams = {
     		queryJson : jsonstr
@@ -899,7 +899,7 @@ Ext.onReady(function(){
 	 
 	 var piedarHtml_fun = function(){
 		   var query = new Object();
-		   query.V_LOGINNAME = $("#V_LOGINNAME").val();
+		   // query.V_LOGINNAME = $("#V_LOGINNAME").val();
 		   $.ajax({
 		          type:'POST',
 		          url: baseUrl+"iot/planteam/getzrrList",
@@ -1094,7 +1094,7 @@ Ext.onReady(function(){
 						query.start_date = Ext.util.Format.date(Ext.getCmp('fm_start_date').getValue(), 'Y-m-d');
 						query.end_date = Ext.util.Format.date(Ext.getCmp('fm_end_date').getValue(), 'Y-m-d');
 						
-						query.V_LOGINNAME = V_LOGINNAME;
+						// query.V_LOGINNAME = V_LOGINNAME;
 			            var jsonstr= Ext.JSON.encode(query); 
 //			            Ext.getCmp('MaintenancePlanEditForm').submit({
 //			            	method:'post',
@@ -1160,7 +1160,7 @@ Ext.onReady(function(){
 							query.start_date = Ext.util.Format.date(Ext.getCmp('fm_start_date').getValue(), 'Y-m-d');
 							query.end_date = Ext.util.Format.date(Ext.getCmp('fm_end_date').getValue(), 'Y-m-d');
 //							query.ID_LIST = list;
-							query.V_LOGINNAME = V_LOGINNAME;
+// 							query.V_LOGINNAME = V_LOGINNAME;
 							var jsonstr= Ext.JSON.encode(query);							
 			                Ext.Ajax.request( { 
 			                        timeout : 3000000, 
@@ -1205,8 +1205,8 @@ Ext.onReady(function(){
     		  query.dwid = label;
 //    		}
 //    		alert("主表ID1"+query.dwid);
-    		query.V_LOGINNAME = V_LOGINNAME;
-    		query.V_PASSWORD =  V_PASSWORD;
+//     		query.V_LOGINNAME = V_LOGINNAME;
+//     		query.V_PASSWORD =  V_PASSWORD;
     		var jsonstr = Ext.JSON.encode(query);
         	myStore1.getProxy().extraParams = {
         		queryJson : jsonstr
@@ -1277,8 +1277,8 @@ Ext.onReady(function(){
 		    html:'<div id="maintenanceplan_look_device"></div>'
 		}).show();
 		var query = new Object();
-		query.V_LOGINNAME = $("#V_LOGINNAME").val();
-		query.V_PASSWORD = $("#V_PASSWORD").val();
+		// query.V_LOGINNAME = $("#V_LOGINNAME").val();
+		// query.V_PASSWORD = $("#V_PASSWORD").val();
 		query.id = spot_id;
 		$.ajax({
 	        type:'POST',

WebRoot/view/maintenancerecord/scripts/maintenancerecord.js

@@ -64,8 +64,8 @@ function exportbtn_click(){
 	    fields += '{id:"'+array[i]+'",title:"'+excelname[i]+'",shown:"'+true+'"}';
 	}
 			var query = new Object();
-			query.V_LOGINNAME = V_LOGINNAME;
-			query.V_PASSWORD = V_PASSWORD;
+			// query.V_LOGINNAME = V_LOGINNAME;
+			// query.V_PASSWORD = V_PASSWORD;
 			query.xj_name = xj_name;
 			query.equipment_id = equipment_id;
 			query.route_name = route_name;
@@ -118,8 +118,8 @@ Ext.onReady(function(){
 		return unchkIcon;
 	}
 	var queryJson = new Object();
-	queryJson.V_LOGINNAME = V_LOGINNAME;
-	queryJson.V_PASSWORD =  V_PASSWORD;
+	// queryJson.V_LOGINNAME = V_LOGINNAME;
+	// queryJson.V_PASSWORD =  V_PASSWORD;
 //	queryJson.COMMSTATUS = 'NO';
 	if((company_code!=null)&&(company_code!='null')&&(company_code.length>0))
 		queryJson.company_code = company_code;
@@ -302,8 +302,8 @@ Ext.onReady(function(){
 		        var form = this.up('form').getForm();
 		        if (form.isValid()) {
 		        	var query = new Object();
-		        	query.V_LOGINNAME = V_LOGINNAME;
-	        		query.V_PASSWORD =  V_PASSWORD;
+		        	// query.V_LOGINNAME = V_LOGINNAME;
+	        		// query.V_PASSWORD =  V_PASSWORD;
 	        		if(Ext.getCmp('ff_name').getValue().length>0)
 		        		query.name = Ext.getCmp('ff_name').getValue();
 		        	    $("#name").val(query.name);

WebRoot/view/patrolAnalysis/scripts/patrolAnalysis.js

@@ -19,8 +19,8 @@ Ext.onReady(function(){
 	$("#V_PASSWORD").val(sessionStorage.getItem('V_PASSWORD'));
 	var maxHeight = 10000;
 	var queryJson = new Object();
-	queryJson.V_LOGINNAME = $("#V_LOGINNAME").val();
-	queryJson.V_PASSWORD =  $("#V_PASSWORD").val();
+	// queryJson.V_LOGINNAME = $("#V_LOGINNAME").val();
+	// queryJson.V_PASSWORD =  $("#V_PASSWORD").val();
 	var draw_confirm = function(start_data,end_data,project_date){
 		var start_data = start_data;
 		var end_data = end_data;
@@ -1173,8 +1173,8 @@ Ext.onReady(function(){
 		    html:'<div style="overflow-y:auto;height:580px;width:640px;"><div id="woker_talkxj"></div></div>'
 		}).show();
 		var query = new Object();
-		query.V_LOGINNAME = $("#V_LOGINNAME").val();
-		query.V_PASSWORD = $("#V_PASSWORD").val();
+		// query.V_LOGINNAME = $("#V_LOGINNAME").val();
+		// query.V_PASSWORD = $("#V_PASSWORD").val();
 		query.start_data = start_data;
 		query.end_data = end_data;
 		query.type = 'xunjian';

WebRoot/view/patrolAnalysis2/scripts/patrolAnalysis.js

@@ -19,8 +19,8 @@ Ext.onReady(function(){
 	$("#V_PASSWORD").val(sessionStorage.getItem('V_PASSWORD'));
 	var maxHeight = 10000;
 	var queryJson = new Object();
-	queryJson.V_LOGINNAME = $("#V_LOGINNAME").val();
-	queryJson.V_PASSWORD =  $("#V_PASSWORD").val();
+	// queryJson.V_LOGINNAME = $("#V_LOGINNAME").val();
+	// queryJson.V_PASSWORD =  $("#V_PASSWORD").val();
 	var draw_confirm = function(start_data,end_data,project_date){
 		var start_data = start_data;
 		var end_data = end_data;
@@ -1173,8 +1173,8 @@ Ext.onReady(function(){
 		    html:'<div style="overflow-y:auto;height:580px;width:640px;"><div id="woker_talkwb"></div></div>'
 		}).show();
 		var query = new Object();
-		query.V_LOGINNAME = $("#V_LOGINNAME").val();
-		query.V_PASSWORD = $("#V_PASSWORD").val();
+		// query.V_LOGINNAME = $("#V_LOGINNAME").val();
+		// query.V_PASSWORD = $("#V_PASSWORD").val();
 		query.start_data = start_data;
 		query.end_data = end_data;
 		query.type = 'weibao';

WebRoot/view/patrolplan/scripts/patrolplan.js

@@ -72,7 +72,7 @@ function exportbtn_click(){
 	    fields += '{id:"'+array[i]+'",title:"'+name[i]+'",shown:"'+true+'"}';
 	}
 			var query = new Object();
-			query.V_LOGINNAME = V_LOGINNAME;
+			// query.V_LOGINNAME = V_LOGINNAME;
 			query.plan_name = plan_name;
 			query.person_liable_id = person_liable_id;
 			query.EXPORT_FILE = '巡检计划列表';
@@ -182,8 +182,8 @@ Ext.onReady(function(){
 		Ext.getCmp('PatrolPlanListPageToolbar').getStore().reload();
 	}
 	var queryJson = new Object();
-	queryJson.V_LOGINNAME = V_LOGINNAME;
-	queryJson.V_PASSWORD =  V_PASSWORD;
+	// queryJson.V_LOGINNAME = V_LOGINNAME;
+	// queryJson.V_PASSWORD =  V_PASSWORD;
 	queryJson.COMMSTATUS = 'NO';
 	if((company_code!=null)&&(company_code!='null')&&(company_code.length>0))
 		queryJson.company_code = company_code;	
@@ -366,8 +366,8 @@ Ext.onReady(function(){
             			        	var label= this.value;
             			 			var query = new Object();
             			     		query.company_code = label;
-            			     		query.V_LOGINNAME = V_LOGINNAME;
-            			     		query.V_PASSWORD =  V_PASSWORD;
+            			     		// query.V_LOGINNAME = V_LOGINNAME;
+            			     		// query.V_PASSWORD =  V_PASSWORD;
             			     		var jsonstr = Ext.JSON.encode(query);
             			         	myStore1.getProxy().extraParams = {
             			         		queryJson : jsonstr
@@ -517,8 +517,8 @@ Ext.onReady(function(){
 		
 		AllSelectedRecords.length = 0;
 		  var query = new Object();
-		  query.V_LOGINNAME=V_LOGINNAME;
-		  query.V_PASSWORD=V_PASSWORD;
+		  // query.V_LOGINNAME=V_LOGINNAME;
+		  // query.V_PASSWORD=V_PASSWORD;
 		  var jsonstr = Ext.JSON.encode(query);
 		     myStore1.getProxy().extraParams = {
 		      queryJson : jsonstr
@@ -565,7 +565,7 @@ Ext.onReady(function(){
 						query.start_date = Ext.util.Format.date(Ext.getCmp('fa_patrol_start_date').getValue(), 'Y-m-d');
 						query.end_date = Ext.util.Format.date(Ext.getCmp('fa_patrol_end_date').getValue(), 'Y-m-d');
 						
-						query.V_LOGINNAME = V_LOGINNAME;
+						// query.V_LOGINNAME = V_LOGINNAME;
 			               var jsonstr= Ext.JSON.encode(query); 
 			               Ext.Ajax.request( { 
 //			                       timeout : 3000000, 
@@ -613,7 +613,7 @@ Ext.onReady(function(){
 							query.start_date = Ext.util.Format.date(Ext.getCmp('fa_patrol_start_date').getValue(), 'Y-m-d');
 							query.end_date = Ext.util.Format.date(Ext.getCmp('fa_patrol_end_date').getValue(), 'Y-m-d');
 //							query.ID_LIST = list;
-							query.V_LOGINNAME = V_LOGINNAME;
+// 							query.V_LOGINNAME = V_LOGINNAME;
 							var jsonstr= Ext.JSON.encode(query);
 			                Ext.Ajax.request( { 
 			                        timeout : 3000000, 
@@ -771,8 +771,8 @@ Ext.onReady(function(){
 		query.person_liable_id = maintenancePlan_title3_input1;
 		$("#person_liable_id").val(maintenancePlan_title3_input1);
 		}
-		query.V_LOGINNAME = V_LOGINNAME;
-		query.V_PASSWORD =  V_PASSWORD;
+		// query.V_LOGINNAME = V_LOGINNAME;
+		// query.V_PASSWORD =  V_PASSWORD;
 		var jsonstr = Ext.JSON.encode(query);
     	myStore.getProxy().extraParams = {
     		queryJson : jsonstr
@@ -952,7 +952,7 @@ Ext.onReady(function(){
 	 
 	 var piedarHtml_fun = function(){
 		   var query = new Object();
-		   query.V_LOGINNAME = $("#V_LOGINNAME").val();
+		   // query.V_LOGINNAME = $("#V_LOGINNAME").val();
 		   $.ajax({
 		          type:'POST',
 		          url: baseUrl+"iot/planteam/getzrrList1",
@@ -1148,7 +1148,7 @@ Ext.onReady(function(){
 						query.start_date = Ext.util.Format.date(Ext.getCmp('fm_patrol_start_date').getValue(), 'Y-m-d');
 						query.end_date = Ext.util.Format.date(Ext.getCmp('fm_patrol_end_date').getValue(), 'Y-m-d');
 						
-						query.V_LOGINNAME = V_LOGINNAME;
+						// query.V_LOGINNAME = V_LOGINNAME;
 			            var jsonstr= Ext.JSON.encode(query); 
 			            Ext.Ajax.request( { 
 //			                       timeout : 3000000, 
@@ -1202,7 +1202,7 @@ Ext.onReady(function(){
 							query.start_date = Ext.util.Format.date(Ext.getCmp('fm_patrol_start_date').getValue(), 'Y-m-d');
 							query.end_date = Ext.util.Format.date(Ext.getCmp('fm_patrol_end_date').getValue(), 'Y-m-d');
 //							query.ID_LIST = list;
-							query.V_LOGINNAME = V_LOGINNAME;
+// 							query.V_LOGINNAME = V_LOGINNAME;
 							var jsonstr= Ext.JSON.encode(query);
 							
 			                Ext.Ajax.request( { 
@@ -1249,8 +1249,8 @@ Ext.onReady(function(){
     		  query.dwid = label;
 //    		}
 //    		alert("主表ID1"+query.dwid);
-    		query.V_LOGINNAME = V_LOGINNAME;
-    		query.V_PASSWORD =  V_PASSWORD;
+//     		query.V_LOGINNAME = V_LOGINNAME;
+//     		query.V_PASSWORD =  V_PASSWORD;
     		var jsonstr = Ext.JSON.encode(query);
         	myStore1.getProxy().extraParams = {
         		queryJson : jsonstr
@@ -1337,8 +1337,8 @@ Ext.onReady(function(){
 		    html:'<div id="patrolplan_look_device"></div>'
 		}).show();
 		var query = new Object();
-		query.V_LOGINNAME = $("#V_LOGINNAME").val();
-		query.V_PASSWORD = $("#V_PASSWORD").val();
+		// query.V_LOGINNAME = $("#V_LOGINNAME").val();
+		// query.V_PASSWORD = $("#V_PASSWORD").val();
 		query.id = spot_id;
 		$.ajax({
 	        type:'POST',

WebRoot/view/patrolpoint/scripts/patrolpoint.js

@@ -150,8 +150,8 @@ function exportbtn_click(){
 	    fields += '{id:"'+array[i]+'",title:"'+excelname[i]+'",shown:"'+true+'"}';
 	}
 			var query = new Object();
-			query.V_LOGINNAME = V_LOGINNAME;
-			query.V_PASSWORD = V_PASSWORD;
+			// query.V_LOGINNAME = V_LOGINNAME;
+			// query.V_PASSWORD = V_PASSWORD;
 			query.spot_name = spot_name;
 			query.spot_address = spot_address;
 			query.EXPORT_FILE = '巡检点位列表';
@@ -233,8 +233,8 @@ Ext.onReady(function(){
 		return unchkIcon;
 	}
 	var queryJson = new Object();
-	queryJson.V_LOGINNAME = V_LOGINNAME;
-	queryJson.V_PASSWORD =  V_PASSWORD;
+	// queryJson.V_LOGINNAME = V_LOGINNAME;
+	// queryJson.V_PASSWORD =  V_PASSWORD;
 	if((company_code!=null)&&(company_code!='null')&&(company_code.length>0))
 		queryJson.company_code = company_code;
 	
@@ -653,8 +653,8 @@ Ext.onReady(function(){
       			        	var label= this.value;
       			 			var query = new Object();
       			     		query.building_id = label;
-      			     		query.V_LOGINNAME = V_LOGINNAME;
-      			     		query.V_PASSWORD =  V_PASSWORD;
+      			     		// query.V_LOGINNAME = V_LOGINNAME;
+      			     		// query.V_PASSWORD =  V_PASSWORD;
       			     		var jsonstr = Ext.JSON.encode(query);
       			         	myStore2.getProxy().extraParams = {
       			         		queryJson : jsonstr
@@ -958,8 +958,8 @@ Ext.onReady(function(){
 	        		query.spot_type = spot_type;
 	        		query.remarks = fm_patrol_point_message;
 	        		query.picture_route = patrol_point_uploadURL;
-	        		query.V_LOGINNAME = V_LOGINNAME;
-		        	query.V_PASSWORD =  V_PASSWORD;
+	        		// query.V_LOGINNAME = V_LOGINNAME;
+		        	// query.V_PASSWORD =  V_PASSWORD;
 		        	var jsonstr = Ext.JSON.encode(query);
 		        	Ext.getCmp('fm_patrol_point_queryJson').setValue(jsonstr);
 	        		Ext.getCmp('patrolUploadForm').submit({
@@ -1011,8 +1011,8 @@ Ext.onReady(function(){
 		        		query.spot_type = spot_type;
 		        		query.remarks = fm_patrol_point_message;
 		        		query.picture_route = patrol_point_uploadURL;
-		        		query.V_LOGINNAME = V_LOGINNAME;
-			        	query.V_PASSWORD =  V_PASSWORD;
+		        		// query.V_LOGINNAME = V_LOGINNAME;
+			        	// query.V_PASSWORD =  V_PASSWORD;
 			        	var jsonstr = Ext.JSON.encode(query);
 			        	Ext.getCmp('fm_patrol_point_queryJson').setValue(jsonstr);
 		        		Ext.getCmp('patrolUploadForm').submit({
@@ -1090,8 +1090,8 @@ Ext.onReady(function(){
 	        		query.remarks = fa_patrol_point_message;
 	        		query.picture_route = patrol_point_addURL;
 	        		query.equipment_code = AllSelectedRecords[0];
-	        		query.V_LOGINNAME = V_LOGINNAME;
-		        	query.V_PASSWORD =  V_PASSWORD;
+	        		// query.V_LOGINNAME = V_LOGINNAME;
+		        	// query.V_PASSWORD =  V_PASSWORD;
 		        	var jsonstr = Ext.JSON.encode(query);
 		        	Ext.getCmp('fa_patrol_point_queryJson').setValue(jsonstr);
 		        	Ext.getCmp('patroladdForm').submit({
@@ -1146,8 +1146,8 @@ Ext.onReady(function(){
 				               }
 
 	                    query.equipment_code = spot_id;
-	  	        		query.V_LOGINNAME = V_LOGINNAME;
-	  		        	query.V_PASSWORD =  V_PASSWORD;
+	  	        		// query.V_LOGINNAME = V_LOGINNAME;
+	  		        	// query.V_PASSWORD =  V_PASSWORD;
 	  		        	var jsonstr = Ext.JSON.encode(query);
 	  		        	Ext.getCmp('fa_patrol_point_queryJson').setValue(jsonstr);
 	  		        	Ext.getCmp('patroladdForm').submit({
@@ -1206,8 +1206,8 @@ Ext.onReady(function(){
 		
 		AllSelectedRecords.length = 0;
 		var query = new Object();
-		query.V_LOGINNAME = $("#V_LOGINNAME").val();
-		query.V_PASSWORD =  $("#V_PASSWORD").val();
+		// query.V_LOGINNAME = $("#V_LOGINNAME").val();
+		// query.V_PASSWORD =  $("#V_PASSWORD").val();
 		var jsonstr = Ext.JSON.encode(query);
     	myStore2.getProxy().extraParams = {
     		queryJson : jsonstr
@@ -1231,8 +1231,8 @@ Ext.onReady(function(){
     		  query.dwid = label;
 //    		}
     		query.building_id = selected[0].raw.company_code;
-    		query.V_LOGINNAME = V_LOGINNAME;
-    		query.V_PASSWORD =  V_PASSWORD;
+    		// query.V_LOGINNAME = V_LOGINNAME;
+    		// query.V_PASSWORD =  V_PASSWORD;
     		var jsonstr = Ext.JSON.encode(query);
         	myStore3.getProxy().extraParams = {
         		queryJson : jsonstr
@@ -1403,8 +1403,8 @@ Ext.onReady(function(){
 		query.spot_address = patrolpoint_title3_input1;
 		$("#spot_address").val(patrolpoint_title3_input1);
 		}
-		query.V_LOGINNAME = V_LOGINNAME;
-		query.V_PASSWORD =  V_PASSWORD;
+		// query.V_LOGINNAME = V_LOGINNAME;
+		// query.V_PASSWORD =  V_PASSWORD;
 		var jsonstr = Ext.JSON.encode(query);
     	myStore.getProxy().extraParams = {
     		queryJson : jsonstr
@@ -1660,8 +1660,8 @@ Ext.onReady(function(){
 		    html:'<div id="patrolpoint_look_label"></div>'
 		}).show();
 		var query = new Object();
-		query.V_LOGINNAME = $("#V_LOGINNAME").val();
-		query.V_PASSWORD = $("#V_PASSWORD").val();
+		// query.V_LOGINNAME = $("#V_LOGINNAME").val();
+		// query.V_PASSWORD = $("#V_PASSWORD").val();
 		query.id = spot_id;
 		$.ajax({
 	        type:'POST',
@@ -1738,8 +1738,8 @@ Ext.onReady(function(){
 		    html:'<div id="patrolpoint_look_device"></div>'
 		}).show();
 		var query = new Object();
-		query.V_LOGINNAME = $("#V_LOGINNAME").val();
-		query.V_PASSWORD = $("#V_PASSWORD").val();
+		// query.V_LOGINNAME = $("#V_LOGINNAME").val();
+		// query.V_PASSWORD = $("#V_PASSWORD").val();
 		query.id = spot_id;
 		$.ajax({
 	        type:'POST',
@@ -1811,8 +1811,8 @@ Ext.onReady(function(){
 		                    if(label.length>0){
 		                      query.id = label;
 		                    }
-		                    query.V_LOGINNAME = V_LOGINNAME;
-		                    query.V_PASSWORD =  V_PASSWORD;
+		                    // query.V_LOGINNAME = V_LOGINNAME;
+		                    // query.V_PASSWORD =  V_PASSWORD;
 		                    var jsonstr = Ext.JSON.encode(query);
 		                       myStore1.getProxy().extraParams = {
 		                        queryJson : jsonstr

WebRoot/view/projectWoker/scripts/projectWoker.js

@@ -16,8 +16,8 @@ Ext.onReady(function(){
 	$("#V_LOGINNAME").val(sessionStorage.getItem('V_LOGINNAME'));
 	$("#V_PASSWORD").val(sessionStorage.getItem('V_PASSWORD'));
 	var queryJson = new Object();
-	queryJson.V_LOGINNAME = $("#V_LOGINNAME").val();
-	queryJson.V_PASSWORD =  $("#V_PASSWORD").val();
+	// queryJson.V_LOGINNAME = $("#V_LOGINNAME").val();
+	// queryJson.V_PASSWORD =  $("#V_PASSWORD").val();
 	var draw_confirm = function(start_data,end_data,project_date){
 		var start_data = start_data;
 		var end_data = end_data;
@@ -1708,8 +1708,8 @@ Ext.onReady(function(){
 		    html:'<div style="overflow-y:auto;height:800px;width:640px;"><div id="woker_talk"></div></div>'
 		}).show();
 		var query = new Object();
-		query.V_LOGINNAME = $("#V_LOGINNAME").val();
-		query.V_PASSWORD = $("#V_PASSWORD").val();
+		// query.V_LOGINNAME = $("#V_LOGINNAME").val();
+		// query.V_PASSWORD = $("#V_PASSWORD").val();
 		query.start_data = start_data;
 		query.end_data = end_data;
 		query.build_code = build_code;

WebRoot/view/pzb/scripts/pzb.js

@@ -75,8 +75,8 @@ Ext.onReady(function(){
 		return unchkIcon;
 	}
 	var queryJson = new Object();
-	queryJson.V_LOGINNAME = V_LOGINNAME;
-	queryJson.V_PASSWORD =  V_PASSWORD;
+	// queryJson.V_LOGINNAME = V_LOGINNAME;
+	// queryJson.V_PASSWORD =  V_PASSWORD;
 	if((company_code!=null)&&(company_code!='null')&&(company_code.length>0))
 		queryJson.company_code = company_code;
 	
@@ -140,7 +140,7 @@ Ext.onReady(function(){
 	
 	var companyxx = function(id) {
 		var query = new Object();
-			query.V_LOGINNAME = $("#V_LOGINNAME").val();
+			// query.V_LOGINNAME = $("#V_LOGINNAME").val();
 			query.id = id;
 //			pieMask.show();
 		$.ajax({
@@ -970,7 +970,7 @@ Ext.onReady(function(){
 	 
 	 var piedarHtml_fun = function(){
 	 		var query = new Object();
-	 		query.V_LOGINNAME = $("#V_LOGINNAME").val();
+	 		// query.V_LOGINNAME = $("#V_LOGINNAME").val();
 	 		$.ajax({
 	 			type:'POST',
 	 			url: baseUrl+"iot/pzb/getXhList",
@@ -990,7 +990,7 @@ Ext.onReady(function(){
 	 
 		var piedarHtml = function() {
 			var query = new Object();
-				query.V_LOGINNAME = $("#V_LOGINNAME").val();
+				// query.V_LOGINNAME = $("#V_LOGINNAME").val();
 				
 			$.ajax({
 		        type:'POST',

WebRoot/view/qrcodeanalysis/scripts/qrcodeanalysis.js

@@ -44,8 +44,8 @@ function exportbtn_click(){
 	    fields += '{id:"'+array[i]+'",title:"'+excelname[i]+'",shown:"'+true+'"}';
 	}
 			var query = new Object();
-			query.V_LOGINNAME = V_LOGINNAME;
-			query.V_PASSWORD = V_PASSWORD;
+			// query.V_LOGINNAME = V_LOGINNAME;
+			// query.V_PASSWORD = V_PASSWORD;
 			query.EXPORT_FILE = '二维码标签列表';
 			query.fields = '['+fields+']';
 			$.ajax({
@@ -90,8 +90,8 @@ Ext.onReady(function(){
 	}
 	
 	var queryJson = new Object();
-	queryJson.V_LOGINNAME = V_LOGINNAME;
-	queryJson.V_PASSWORD =  V_PASSWORD;
+	// queryJson.V_LOGINNAME = V_LOGINNAME;
+	// queryJson.V_PASSWORD =  V_PASSWORD;
 //	queryJson.COMMSTATUS = 'NO';
 	if((company_code!=null)&&(company_code!='null')&&(company_code.length>0))
 		queryJson.company_code = company_code;
@@ -154,7 +154,7 @@ Ext.onReady(function(){
 		        var form = this.up('form').getForm();
 		        if (form.isValid()) {
 		        	var query = new Object();
-		        	query.V_LOGINNAME = V_LOGINNAME;
+		        	// query.V_LOGINNAME = V_LOGINNAME;
 		        	query.analysis_content = Ext.getCmp('fa_analysis_content').getValue();
 		        	var jsonstr = Ext.JSON.encode(query);
 		        	Ext.getCmp('fa_queryJson').setValue(jsonstr);

WebRoot/view/qrcodeanalysis2/scripts/qrcodeanalysis2.js

@@ -33,8 +33,8 @@ Ext.define('QrcodeAnalysis2',{
 
 function exportbtn_click(){
 	baseUrl = document.getElementById('basePath').value;
-	V_LOGINNAME = $("#V_LOGINNAME").val();
-	V_PASSWORD = $("#V_PASSWORD").val();
+	// V_LOGINNAME = $("#V_LOGINNAME").val();
+	// V_PASSWORD = $("#V_PASSWORD").val();
 	var fields = '';
 	var array = ['id','analysis_content'];
 	var excelname = ['编号','二维码解析'];
@@ -44,8 +44,8 @@ function exportbtn_click(){
 	    fields += '{id:"'+array[i]+'",title:"'+excelname[i]+'",shown:"'+true+'"}';
 	}
 			var query = new Object();
-			query.V_LOGINNAME = V_LOGINNAME;
-			query.V_PASSWORD = V_PASSWORD;
+			// query.V_LOGINNAME = V_LOGINNAME;
+			// query.V_PASSWORD = V_PASSWORD;
 			query.EXPORT_FILE = '二维码标签列表';
 			query.fields = '['+fields+']';
 			$.ajax({
@@ -90,8 +90,8 @@ Ext.onReady(function(){
 	}
 	
 	var queryJson = new Object();
-	queryJson.V_LOGINNAME = V_LOGINNAME;
-	queryJson.V_PASSWORD =  V_PASSWORD;
+	// queryJson.V_LOGINNAME = V_LOGINNAME;
+	// queryJson.V_PASSWORD =  V_PASSWORD;
 //	queryJson.COMMSTATUS = 'NO';
 	if((company_code!=null)&&(company_code!='null')&&(company_code.length>0))
 		queryJson.company_code = company_code;
@@ -154,7 +154,7 @@ Ext.onReady(function(){
 		        var form = this.up('form').getForm();
 		        if (form.isValid()) {
 		        	var query = new Object();
-		        	query.V_LOGINNAME = V_LOGINNAME;
+		        	// query.V_LOGINNAME = V_LOGINNAME;
 		        	query.analysis_content = Ext.getCmp('fa_analysis_content').getValue();
 		        	var jsonstr = Ext.JSON.encode(query);
 		        	Ext.getCmp('fa_queryJson').setValue(jsonstr);

WebRoot/view/route/scripts/route.js

@@ -49,8 +49,8 @@ function exportbtn_click(){
 	    fields += '{id:"'+array[i]+'",title:"'+name[i]+'",shown:"'+true+'"}';
 	}
 			var query = new Object();
-			query.V_LOGINNAME = V_LOGINNAME;
-			query.V_PASSWORD = V_PASSWORD;
+			// query.V_LOGINNAME = V_LOGINNAME;
+			// query.V_PASSWORD = V_PASSWORD;
 			query.route_name = route_name;
 			query.route = route;
 			query.EXPORT_FILE = '巡检路线列表';
@@ -97,8 +97,8 @@ Ext.onReady(function(){
 		return unchkIcon;
 	}
 	var queryJson = new Object();
-	queryJson.V_LOGINNAME = V_LOGINNAME;
-	queryJson.V_PASSWORD =  V_PASSWORD;
+	// queryJson.V_LOGINNAME = V_LOGINNAME;
+	// queryJson.V_PASSWORD =  V_PASSWORD;
 //	queryJson.COMMSTATUS = 'NO';
 	if((company_code!=null)&&(company_code!='null')&&(company_code.length>0))
 		queryJson.company_code = company_code;
@@ -243,7 +243,7 @@ Ext.onReady(function(){
 		        var form = this.up('form').getForm();
 		        if (form.isValid()) {
 		        	var query = new Object();
-		        	query.V_LOGINNAME = V_LOGINNAME;
+		        	// query.V_LOGINNAME = V_LOGINNAME;
 		        	query.route_name = Ext.getCmp('fa_route_name').getValue();
 //		        	var a,b,c; 
 		        	a = Ext.getCmp('fa_route').getValue();
@@ -336,8 +336,8 @@ Ext.onReady(function(){
 //		        	}else{
 //		        		company_code = null;
 //		        	}
-		        	query.V_LOGINNAME = V_LOGINNAME;
-	        		query.V_PASSWORD =  V_PASSWORD;
+// 		        	query.V_LOGINNAME = V_LOGINNAME;
+// 	        		query.V_PASSWORD =  V_PASSWORD;
 		        	if(Ext.getCmp('ff_route_name').getValue().length>0)
 		        		query.route_name = Ext.getCmp('ff_route_name').getValue();
 		        	    $("#route_name").val(query.route_name);

WebRoot/view/route2/scripts/route2.js

@@ -49,8 +49,8 @@ function exportbtn_click(){
 	    fields += '{id:"'+array[i]+'",title:"'+name[i]+'",shown:"'+true+'"}';
 	}
 			var query = new Object();
-			query.V_LOGINNAME = V_LOGINNAME;
-			query.V_PASSWORD = V_PASSWORD;
+			// query.V_LOGINNAME = V_LOGINNAME;
+			// query.V_PASSWORD = V_PASSWORD;
 			query.route_name = route_name;
 			query.route = route;
 			query.EXPORT_FILE = '巡检路线列表';
@@ -97,8 +97,8 @@ Ext.onReady(function(){
 		return unchkIcon;
 	}
 	var queryJson = new Object();
-	queryJson.V_LOGINNAME = V_LOGINNAME;
-	queryJson.V_PASSWORD =  V_PASSWORD;
+	// queryJson.V_LOGINNAME = V_LOGINNAME;
+	// queryJson.V_PASSWORD =  V_PASSWORD;
 //	queryJson.COMMSTATUS = 'NO';
 	if((company_code!=null)&&(company_code!='null')&&(company_code.length>0))
 		queryJson.company_code = company_code;
@@ -243,7 +243,7 @@ Ext.onReady(function(){
 		        var form = this.up('form').getForm();
 		        if (form.isValid()) {
 		        	var query = new Object();
-		        	query.V_LOGINNAME = V_LOGINNAME;
+		        	// query.V_LOGINNAME = V_LOGINNAME;
 		        	query.route_name = Ext.getCmp('fa_route_name').getValue();
 //		        	var a,b,c; 
 		        	a = Ext.getCmp('fa_route').getValue();
@@ -336,8 +336,8 @@ Ext.onReady(function(){
 //		        	}else{
 //		        		company_code = null;
 //		        	}
-		        	query.V_LOGINNAME = V_LOGINNAME;
-	        		query.V_PASSWORD =  V_PASSWORD;
+// 		        	query.V_LOGINNAME = V_LOGINNAME;
+// 	        		query.V_PASSWORD =  V_PASSWORD;
 	        		if(Ext.getCmp('ff_route_name').getValue().length>0)
 		        		query.route_name = Ext.getCmp('ff_route_name').getValue();
 		        	    $("#route_name").val(query.route_name);

WebRoot/view/rtuAlarm/scripts/rtuDevice.js

@@ -483,8 +483,8 @@ var draw_cycle_icon = function(icon_id,name, total, num, themecolor){
 
 var getCurrentData = function(){
 	var query = new Object();
-	query.V_LOGINNAME = V_LOGINNAME;
-	query.V_PASSWORD = V_PASSWORD;
+	// query.V_LOGINNAME = V_LOGINNAME;
+	// query.V_PASSWORD = V_PASSWORD;
 	query.dwtype='6';
 	query.COMMSTATUS = 'ONLY';
 	pieMask.show();
@@ -539,7 +539,7 @@ function exportbtn_click(){
 	    fields += '{id:"'+array[i]+'",title:"'+name[i]+'",shown:"'+true+'"}';
 	}
 			var query = new Object();
-			query.V_LOGINNAME = V_LOGINNAME;
+			// query.V_LOGINNAME = V_LOGINNAME;
 			query.company_code = company_code;
 			query.clzt = clzt;
 			query.time_start = time_start;
@@ -588,8 +588,8 @@ Ext.onReady(function(){
 		return unchkIcon;
 	}
 	var queryJson = new Object();
-	queryJson.V_LOGINNAME = V_LOGINNAME;
-	queryJson.V_PASSWORD =  V_PASSWORD;
+	// queryJson.V_LOGINNAME = V_LOGINNAME;
+	// queryJson.V_PASSWORD =  V_PASSWORD;
 	queryJson.COMMSTATUS = 'ONLY';
 	if((company_code!=null)&&(company_code!='null')&&(company_code.length>0))
 		queryJson.company_code = company_code;
@@ -742,8 +742,8 @@ Ext.onReady(function(){
 		        		$("#time_end").val('');
 		        	}
 //	        		query.clzt = Ext.getCmp('ff_clzt').getValue()==null?"":Ext.getCmp('ff_clzt').getValue();
-	        		query.V_LOGINNAME = V_LOGINNAME;
-	        		query.V_PASSWORD =  V_PASSWORD;
+// 	        		query.V_LOGINNAME = V_LOGINNAME;
+// 	        		query.V_PASSWORD =  V_PASSWORD;
 	        		query.COMMSTATUS = 'ONLY';
 		        	var jsonstr = Ext.JSON.encode(query);
 		        	myStore.getProxy().extraParams = {
@@ -898,8 +898,8 @@ Ext.onReady(function(){
 		    	var form = this.up('form').getForm();
 		        if (form.isValid()) {
 		        	var queryJson = new Object();
-		        	queryJson.V_LOGINNAME = V_LOGINNAME;
-		        	queryJson.V_PASSWORD = V_PASSWORD;
+		        	// queryJson.V_LOGINNAME = V_LOGINNAME;
+		        	// queryJson.V_PASSWORD = V_PASSWORD;
 		        	queryJson.id = Ext.getCmp('uf_id').getValue();
 		        	queryJson.status = Ext.getCmp('uf_status').getValue();
 		        	queryJson.name = Ext.getCmp('uf_name').getValue();

WebRoot/view/rtuAlarm/scripts/rtuOption.js

@@ -484,8 +484,8 @@ var draw_cycle_icon = function(icon_id,name, total, num, themecolor){
 
 var getCurrentData = function(){
 	var query = new Object();
-	query.V_LOGINNAME = V_LOGINNAME;
-	query.V_PASSWORD = V_PASSWORD;
+	// query.V_LOGINNAME = V_LOGINNAME;
+	// query.V_PASSWORD = V_PASSWORD;
 	query.dwtype = '6';
 	query.COMMSTATUS = 'NO';
 	if((company_code!=null)&&(company_code!='null')&&(company_code.length>0))
@@ -526,7 +526,7 @@ var body_resize = function(){
 }
 
 function exportbtn_click(){
-	V_LOGINNAME = $("#V_LOGINNAME").val();
+	// V_LOGINNAME = $("#V_LOGINNAME").val();
 	company_code = document.getElementById('company_code').value;
 	clzt = document.getElementById('clzt').value;
 	time_start = document.getElementById('time_start').value;
@@ -540,7 +540,7 @@ function exportbtn_click(){
 	    fields += '{id:"'+array[i]+'",title:"'+name[i]+'",shown:"'+true+'"}';
 	}
 			var query = new Object();
-			query.V_LOGINNAME = V_LOGINNAME;
+			// query.V_LOGINNAME = V_LOGINNAME;
 			query.company_code = company_code;
 			query.clzt = clzt;
 			query.time_start = time_start;
@@ -590,8 +590,8 @@ Ext.onReady(function(){
 		return unchkIcon;
 	}
 	var queryJson = new Object();
-	queryJson.V_LOGINNAME = V_LOGINNAME;
-	queryJson.V_PASSWORD =  V_PASSWORD;
+	// queryJson.V_LOGINNAME = V_LOGINNAME;
+	// queryJson.V_PASSWORD =  V_PASSWORD;
     queryJson.COMMSTATUS = 'NO';
     if((company_code!=null)&&(company_code!='null')&&(company_code.length>0))
 		queryJson.company_code = company_code;
@@ -744,8 +744,8 @@ Ext.onReady(function(){
 		        		$("#time_end").val('');
 		        	}
 //	        		query.clzt = Ext.getCmp('ff_clzt').getValue()==null?"":Ext.getCmp('ff_clzt').getValue();
-	        		query.V_LOGINNAME = V_LOGINNAME;
-	        		query.V_PASSWORD =  V_PASSWORD;
+// 	        		query.V_LOGINNAME = V_LOGINNAME;
+// 	        		query.V_PASSWORD =  V_PASSWORD;
 	        		query.COMMSTATUS = 'NO';
 		        	var jsonstr = Ext.JSON.encode(query);
 		        	myStore.getProxy().extraParams = {
@@ -900,8 +900,8 @@ Ext.onReady(function(){
 		    	var form = this.up('form').getForm();
 		        if (form.isValid()) {
 		        	var queryJson = new Object();
-		        	queryJson.V_LOGINNAME = V_LOGINNAME;
-		        	queryJson.V_PASSWORD = V_PASSWORD;
+		        	// queryJson.V_LOGINNAME = V_LOGINNAME;
+		        	// queryJson.V_PASSWORD = V_PASSWORD;
 		        	queryJson.id = Ext.getCmp('uf_id').getValue();
 		        	queryJson.status = Ext.getCmp('uf_status').getValue();
 		        	queryJson.name = Ext.getCmp('uf_name').getValue();

WebRoot/view/scripts/mainframe.js

@@ -171,8 +171,8 @@ Ext.onReady(function() {
 	$("#V_LOGINNAME").val(sessionStorage.getItem('V_LOGINNAME'));
 	$("#V_PASSWORD").val(sessionStorage.getItem('V_PASSWORD'));
 	var queryJson = new Object();
-	queryJson.V_LOGINNAME = $("#V_LOGINNAME").val();
-	queryJson.V_PASSWORD =  $("#V_PASSWORD").val();
+	// queryJson.V_LOGINNAME = $("#V_LOGINNAME").val();
+	// queryJson.V_PASSWORD =  $("#V_PASSWORD").val();
 	Ext.define('CompanyComboStore1',{
 		extend:'Ext.data.Model',
 		fields: [
@@ -1040,8 +1040,8 @@ Ext.onReady(function() {
 	        iconCls: 'user_logout_btn',
 	        handler: function(){
 	        	var query = new Object();
-	        	query.V_LOGINNAME = V_LOGINNAME;
-	        	query.V_PASSWORD = V_PASSWORD;
+	        	// query.V_LOGINNAME = V_LOGINNAME;
+	        	// query.V_PASSWORD = V_PASSWORD;
 	        	$.ajax({
 	                type:'POST',
 	                url: baseUrl+'iot/admin/logout',

WebRoot/view/scripts/map.js

@@ -687,8 +687,8 @@ var update_companyList = function(){
 	$("#saerch_company_list").html('');
 	if($("#search_company").val().length>0){
 		var query = new Object();
-		query.V_LOGINNAME = V_LOGINNAME;
-		query.V_PASSWORD = V_PASSWORD;
+		// query.V_LOGINNAME = V_LOGINNAME;
+		// query.V_PASSWORD = V_PASSWORD;
 		query.V_COMPANY_NAME = $("#search_company").val();
 		$.ajax({
 			type:'POST',

WebRoot/view/springhandle/scripts/springHandle.js

@@ -90,8 +90,8 @@ function exportbtn_click(){
 	    fields += '{id:"'+array[i]+'",title:"'+name[i]+'",shown:"'+true+'"}';
 	}
 			var query = new Object();
-			query.V_LOGINNAME = V_LOGINNAME;
-			query.V_PASSWORD = V_PASSWORD;
+			// query.V_LOGINNAME = V_LOGINNAME;
+			// query.V_PASSWORD = V_PASSWORD;
 			query.wx_name = wx_name;
 			query.person_liable = person_liable;
 			query.cl_time_k = cl_time_k;
@@ -142,8 +142,8 @@ Ext.onReady(function(){
 		return unchkIcon;
 	}
 	var queryJson = new Object();
-	queryJson.V_LOGINNAME = V_LOGINNAME;
-	queryJson.V_PASSWORD =  V_PASSWORD;
+	// queryJson.V_LOGINNAME = V_LOGINNAME;
+	// queryJson.V_PASSWORD =  V_PASSWORD;
 //	queryJson.COMMSTATUS = 'NO';
 	if((company_code!=null)&&(company_code!='null')&&(company_code.length>0))
 		queryJson.company_code = company_code;
@@ -242,8 +242,8 @@ Ext.onReady(function(){
 			$("#sj_type").val(sj_type);
 		}
 		
-		query.V_LOGINNAME = V_LOGINNAME;
-		query.V_PASSWORD =  V_PASSWORD;
+		// query.V_LOGINNAME = V_LOGINNAME;
+		// query.V_PASSWORD =  V_PASSWORD;
 		var jsonstr = Ext.JSON.encode(query);
     	myStore.getProxy().extraParams = {
     		queryJson : jsonstr
@@ -1136,8 +1136,8 @@ Ext.onReady(function(){
 		    html:'<div style="overflow-y:auto;height:580px;width:640px;"><div id="woker_talkbx"></div></div>'
 		}).show();
 		var query = new Object();
-		query.V_LOGINNAME = $("#V_LOGINNAME").val();
-		query.V_PASSWORD = $("#V_PASSWORD").val();
+		// query.V_LOGINNAME = $("#V_LOGINNAME").val();
+		// query.V_PASSWORD = $("#V_PASSWORD").val();
 		query.start_data = start_data;
 		query.end_data = end_data;
 		query.type = 'baoxiu';
@@ -1348,8 +1348,8 @@ Ext.onReady(function(){
 			    html:'<div id="inspectorsCheck_look_device"></div>'
 			}).show();
 			var query = new Object();
-			query.V_LOGINNAME = $("#V_LOGINNAME").val();
-			query.V_PASSWORD = $("#V_PASSWORD").val();
+			// query.V_LOGINNAME = $("#V_LOGINNAME").val();
+			// query.V_PASSWORD = $("#V_PASSWORD").val();
 			query.id = spot_id;
 			$.ajax({
 		        type:'POST',
@@ -1547,8 +1547,8 @@ Ext.onReady(function(){
 //				    			if(spot_id.length>0){
 				    				query.id = spot_id;
 //				    			}
-				    			query.V_LOGINNAME = V_LOGINNAME;
-				    			query.V_PASSWORD =  V_PASSWORD;
+// 				    			query.V_LOGINNAME = V_LOGINNAME;
+// 				    			query.V_PASSWORD =  V_PASSWORD;
 				    			$.ajax({
 				    		        type:'POST',
 				    		        url: baseUrl+"iot/xjeventprocessing/updatezp",
@@ -1591,8 +1591,8 @@ Ext.onReady(function(){
 				    html:'<div style="overflow-y:auto;height:240px;width:500px;background:#002c59;"><div id="springHandle_look_Presentation"></div></div>'
 				}).show();
 				var query = new Object();
-				query.V_LOGINNAME = $("#V_LOGINNAME").val();
-				query.V_PASSWORD = $("#V_PASSWORD").val();
+				// query.V_LOGINNAME = $("#V_LOGINNAME").val();
+				// query.V_PASSWORD = $("#V_PASSWORD").val();
 				query.jlid = spot_id;
 				$.ajax({
 			        type:'POST',
@@ -1620,8 +1620,8 @@ Ext.onReady(function(){
 				    html:'<div style="overflow-y:auto;height:270px;width:500px;background:#002c59;"><div id="springHandle_look_Presentation"></div></div>'
 				}).show();
 				var query = new Object();
-				query.V_LOGINNAME = $("#V_LOGINNAME").val();
-				query.V_PASSWORD = $("#V_PASSWORD").val();
+				// query.V_LOGINNAME = $("#V_LOGINNAME").val();
+				// query.V_PASSWORD = $("#V_PASSWORD").val();
 				query.id = spot_id;
 				$.ajax({
 			        type:'POST',
@@ -2169,8 +2169,8 @@ Ext.onReady(function(){
 		 if(document.getElementById('springHandlePanel3')!=undefined)
 				document.getElementById('springHandlePanel3').innerHTML="";
 		 var query = new Object();
-			query.V_LOGINNAME = $("#V_LOGINNAME").val();
-			query.V_PASSWORD = $("#V_PASSWORD").val();
+			// query.V_LOGINNAME = $("#V_LOGINNAME").val();
+			// query.V_PASSWORD = $("#V_PASSWORD").val();
 			query.event_processing_id = id;
 		 $.ajax({
 		        type:'POST',
@@ -2325,8 +2325,8 @@ Ext.onReady(function(){
 			    				query.sh_remarks = bz;
 			    			}
 			    			query.id = id;
-			    			query.V_LOGINNAME = V_LOGINNAME;
-			    			query.V_PASSWORD =  V_PASSWORD;
+			    			// query.V_LOGINNAME = V_LOGINNAME;
+			    			// query.V_PASSWORD =  V_PASSWORD;
 			    			$.ajax({
 			    		        type:'POST',
 			    		        url: baseUrl+"iot/xjeventprocessing/updatesh",
@@ -2425,8 +2425,8 @@ Ext.onReady(function(){
 			    				query.sh_remarks = bz;
 			    			}
 			    			query.id = id;
-			    			query.V_LOGINNAME = V_LOGINNAME;
-			    			query.V_PASSWORD =  V_PASSWORD;
+			    			// query.V_LOGINNAME = V_LOGINNAME;
+			    			// query.V_PASSWORD =  V_PASSWORD;
 			    			$.ajax({
 			    		        type:'POST',
 			    		        url: baseUrl+"iot/xjeventprocessing/updatesh",
@@ -2539,8 +2539,8 @@ Ext.onReady(function(){
 				if(document.getElementById('springHandlePanel1')!=undefined)
 					document.getElementById('springHandlePanel1').innerHTML="";
 				var query = new Object();
-				query.V_LOGINNAME = $("#V_LOGINNAME").val();
-				query.V_PASSWORD = $("#V_PASSWORD").val();
+				// query.V_LOGINNAME = $("#V_LOGINNAME").val();
+				// query.V_PASSWORD = $("#V_PASSWORD").val();
 				query.id = spot_id;
 				$.ajax({
 			        type:'POST',
@@ -2565,8 +2565,8 @@ Ext.onReady(function(){
 				if(document.getElementById('springHandlePanel2')!=undefined)
 					document.getElementById('springHandlePanel2').innerHTML="";
 				var query = new Object();
-				query.V_LOGINNAME = $("#V_LOGINNAME").val();
-				query.V_PASSWORD = $("#V_PASSWORD").val();
+				// query.V_LOGINNAME = $("#V_LOGINNAME").val();
+				// query.V_PASSWORD = $("#V_PASSWORD").val();
 				query.id = spot_id;
 				$.ajax({
 			        type:'POST',
@@ -2591,8 +2591,8 @@ Ext.onReady(function(){
 				if(document.getElementById('springHandleHtml4')!=undefined)
 					document.getElementById('springHandleHtml4').innerHTML="";
 				var query = new Object();
-				query.V_LOGINNAME = $("#V_LOGINNAME").val();
-				query.V_PASSWORD = $("#V_PASSWORD").val();
+				// query.V_LOGINNAME = $("#V_LOGINNAME").val();
+				// query.V_PASSWORD = $("#V_PASSWORD").val();
 				query.event_processing_id = spot_id;
 				$.ajax({
 			        type:'POST',
@@ -2617,8 +2617,8 @@ Ext.onReady(function(){
 				if(document.getElementById('springHandlePanel4')!=undefined)
 					document.getElementById('springHandlePanel4').innerHTML="";
 				var query = new Object();
-				query.V_LOGINNAME = $("#V_LOGINNAME").val();
-				query.V_PASSWORD = $("#V_PASSWORD").val();
+				// query.V_LOGINNAME = $("#V_LOGINNAME").val();
+				// query.V_PASSWORD = $("#V_PASSWORD").val();
 				query.event_processing_id = spot_id;
 				$.ajax({
 			        type:'POST',
@@ -2692,8 +2692,8 @@ Ext.onReady(function(){
 			    html:'<div style="overflow-y:auto;height:270px;width:500px;background:#002c59;"><div id="shangbao_xiangqing"></div></div>'
 			}).show();
 			var query = new Object();
-			query.V_LOGINNAME = $("#V_LOGINNAME").val();
-			query.V_PASSWORD = $("#V_PASSWORD").val();
+			// query.V_LOGINNAME = $("#V_LOGINNAME").val();
+			// query.V_PASSWORD = $("#V_PASSWORD").val();
 			query.id = id;
 			$.ajax({
 		        type:'POST',
@@ -2919,7 +2919,7 @@ Ext.onReady(function(){
 	 
 		var piedarHtml = function() {
 			var query = new Object();
-				query.V_LOGINNAME = $("#V_LOGINNAME").val();
+				// query.V_LOGINNAME = $("#V_LOGINNAME").val();
 				
 			$.ajax({
 		        type:'POST',

WebRoot/view/videoAlarm/scripts/VideoDevice.js

@@ -490,8 +490,8 @@ var draw_cycle_icon = function(icon_id,name, total, num, themecolor){
 
 var getCurrentData = function(){
 	var query = new Object();
-	query.V_LOGINNAME = V_LOGINNAME;
-	query.V_PASSWORD = V_PASSWORD;
+	// query.V_LOGINNAME = V_LOGINNAME;
+	// query.V_PASSWORD = V_PASSWORD;
 	query.dwtype='18';
 	query.COMMSTATUS = 'ONLY';
 	pieMask.show();
@@ -532,7 +532,7 @@ var body_resize = function(){
 }
 
 function exportbtn_click(){
-	V_LOGINNAME = $("#V_LOGINNAME").val();
+	// V_LOGINNAME = $("#V_LOGINNAME").val();
 	company_code = document.getElementById('company_code').value;
 	clzt = document.getElementById('clzt').value;
 	time_start = document.getElementById('time_start').value;
@@ -546,7 +546,7 @@ function exportbtn_click(){
 	    fields += '{id:"'+array[i]+'",title:"'+name[i]+'",shown:"'+true+'"}';
 	}
 			var query = new Object();
-			query.V_LOGINNAME = V_LOGINNAME;
+			// query.V_LOGINNAME = V_LOGINNAME;
 			query.company_code = company_code;
 			query.clzt = clzt;
 			query.time_start = time_start;
@@ -595,8 +595,8 @@ Ext.onReady(function(){
 		return unchkIcon;
 	}
 	var queryJson = new Object();
-	queryJson.V_LOGINNAME = V_LOGINNAME;
-	queryJson.V_PASSWORD =  V_PASSWORD;
+	// queryJson.V_LOGINNAME = V_LOGINNAME;
+	// queryJson.V_PASSWORD =  V_PASSWORD;
 	queryJson.COMMSTATUS = 'ONLY';
 	if((company_code!=null)&&(company_code!='null')&&(company_code.length>0))
 		queryJson.company_code = company_code;
@@ -749,8 +749,8 @@ Ext.onReady(function(){
 		        		$("#time_end").val('');
 		        	}
 //	        		query.clzt = Ext.getCmp('ff_clzt').getValue()==null?"":Ext.getCmp('ff_clzt').getValue();
-	        		query.V_LOGINNAME = V_LOGINNAME;
-	        		query.V_PASSWORD =  V_PASSWORD;
+// 	        		query.V_LOGINNAME = V_LOGINNAME;
+// 	        		query.V_PASSWORD =  V_PASSWORD;
 	        		query.COMMSTATUS = 'ONLY';
 		        	var jsonstr = Ext.JSON.encode(query);
 		        	myStore.getProxy().extraParams = {
@@ -905,8 +905,8 @@ Ext.onReady(function(){
 		    	var form = this.up('form').getForm();
 		        if (form.isValid()) {
 		        	var queryJson = new Object();
-		        	queryJson.V_LOGINNAME = V_LOGINNAME;
-		        	queryJson.V_PASSWORD = V_PASSWORD;
+		        	// queryJson.V_LOGINNAME = V_LOGINNAME;
+		        	// queryJson.V_PASSWORD = V_PASSWORD;
 		        	queryJson.id = Ext.getCmp('uf_id').getValue();
 		        	queryJson.status = Ext.getCmp('uf_status').getValue();
 		        	queryJson.name = Ext.getCmp('uf_name').getValue();

WebRoot/view/videoAlarm/scripts/videoOption.js

@@ -488,8 +488,8 @@ var draw_cycle_icon = function (icon_id, name, total, num, themecolor) {
 
 var getCurrentData = function () {
     var query = new Object();
-    query.V_LOGINNAME = V_LOGINNAME;
-    query.V_PASSWORD = V_PASSWORD;
+    // query.V_LOGINNAME = V_LOGINNAME;
+    // query.V_PASSWORD = V_PASSWORD;
     query.dwtype = '16';
     query.COMMSTATUS = 'NO';
     if ((company_code != null) && (company_code != 'null') && (company_code.length > 0))
@@ -544,7 +544,7 @@ function exportbtn_click() {
         fields += '{id:"' + array[i] + '",title:"' + name[i] + '",shown:"' + true + '"}';
     }
     var query = new Object();
-    query.V_LOGINNAME = V_LOGINNAME;
+    // query.V_LOGINNAME = V_LOGINNAME;
     query.company_code = company_code;
     query.clzt = clzt;
     query.time_start = time_start;
@@ -594,8 +594,8 @@ Ext.onReady(function () {
         return unchkIcon;
     }
     var queryJson = new Object();
-    queryJson.V_LOGINNAME = V_LOGINNAME;
-    queryJson.V_PASSWORD = V_PASSWORD;
+    // queryJson.V_LOGINNAME = V_LOGINNAME;
+    // queryJson.V_PASSWORD = V_PASSWORD;
     queryJson.COMMSTATUS = 'NO';
     if ((company_code != null) && (company_code != 'null') && (company_code.length > 0))
         queryJson.company_code = company_code;
@@ -748,8 +748,8 @@ Ext.onReady(function () {
                         $("#time_end").val('');
                     }
 //	        		query.clzt = Ext.getCmp('ff_clzt').getValue()==null?"":Ext.getCmp('ff_clzt').getValue();
-                    query.V_LOGINNAME = V_LOGINNAME;
-                    query.V_PASSWORD = V_PASSWORD;
+//                     query.V_LOGINNAME = V_LOGINNAME;
+//                     query.V_PASSWORD = V_PASSWORD;
                     query.COMMSTATUS = 'NO';
                     var jsonstr = Ext.JSON.encode(query);
                     myStore.getProxy().extraParams = {
@@ -1031,8 +1031,8 @@ Ext.onReady(function () {
                 var form = this.up('form').getForm();
                 if (form.isValid()) {
                     var queryJson = new Object();
-                    queryJson.V_LOGINNAME = V_LOGINNAME;
-                    queryJson.V_PASSWORD = V_PASSWORD;
+                    // queryJson.V_LOGINNAME = V_LOGINNAME;
+                    // queryJson.V_PASSWORD = V_PASSWORD;
                     queryJson.dwtype = Ext.getCmp('uf_dwtype').getValue();;
                     queryJson.id = Ext.getCmp('uf_id').getValue();
                     queryJson.status = Ext.getCmp('uf_status').getValue();

WebRoot/view/waterAlarm/scripts/waterBattery.js

@@ -518,8 +518,8 @@ var show_datapie = function(record){
 			$("#operation_area").html('');
 			pieMask.show();
 			var query = new Object();
-			query.V_LOGINNAME = V_LOGINNAME;
-			query.V_PASSWORD = V_PASSWORD;
+			// query.V_LOGINNAME = V_LOGINNAME;
+			// query.V_PASSWORD = V_PASSWORD;
 			query.device_id = device_id;
 			query.dwtype = '2';
 			query.point_code = '2,3';
@@ -579,8 +579,8 @@ Ext.onReady(function(){
 		return unchkIcon;
 	}
 	var queryJson = new Object();
-	queryJson.V_LOGINNAME = V_LOGINNAME;
-	queryJson.V_PASSWORD =  V_PASSWORD;
+	// queryJson.V_LOGINNAME = V_LOGINNAME;
+	// queryJson.V_PASSWORD =  V_PASSWORD;
 	queryJson.dwtype = '2';
 	queryJson.point_code = '2'
 	if((company_code!=null)&&(company_code!='null')&&(company_code.length>0))
@@ -687,8 +687,8 @@ Ext.onReady(function(){
 		        		company_code = null;
 		        	}
 //	        		query.clzt = Ext.getCmp('ff_clzt').getValue()==null?"":Ext.getCmp('ff_clzt').getValue();
-	        		query.V_LOGINNAME = V_LOGINNAME;
-	        		query.V_PASSWORD =  V_PASSWORD;
+// 	        		query.V_LOGINNAME = V_LOGINNAME;
+// 	        		query.V_PASSWORD =  V_PASSWORD;
 	        		query.COMMSTATUS = 'NO';
 		        	var jsonstr = Ext.JSON.encode(query);
 		        	myStore.getProxy().extraParams = {
@@ -843,8 +843,8 @@ Ext.onReady(function(){
 		    	var form = this.up('form').getForm();
 		        if (form.isValid()) {
 		        	var queryJson = new Object();
-		        	queryJson.V_LOGINNAME = V_LOGINNAME;
-		        	queryJson.V_PASSWORD = V_PASSWORD;
+		        	// queryJson.V_LOGINNAME = V_LOGINNAME;
+		        	// queryJson.V_PASSWORD = V_PASSWORD;
 		        	queryJson.id = Ext.getCmp('uf_id').getValue();
 		        	queryJson.status = Ext.getCmp('uf_status').getValue();
 		        	queryJson.name = Ext.getCmp('uf_name').getValue();

WebRoot/view/waterAlarm/scripts/waterDevice.js

@@ -478,8 +478,8 @@ var draw_cycle_icon = function(icon_id,name, total, num, themecolor){
 
 var getCurrentData = function(){
 	var query = new Object();
-	query.V_LOGINNAME = V_LOGINNAME;
-	query.V_PASSWORD = V_PASSWORD;
+	// query.V_LOGINNAME = V_LOGINNAME;
+	// query.V_PASSWORD = V_PASSWORD;
 	query.dwtype='2';
 	query.COMMSTATUS = 'ONLY';
 	if((company_code!=null)&&(company_code!='null')&&(company_code.length>0))
@@ -534,7 +534,7 @@ function exportbtn_click(){
 	    fields += '{id:"'+array[i]+'",title:"'+name[i]+'",shown:"'+true+'"}';
 	}
 			var query = new Object();
-			query.V_LOGINNAME = V_LOGINNAME;
+			// query.V_LOGINNAME = V_LOGINNAME;
 			query.company_code = company_code;
 			query.clzt = clzt;
 			query.time_start = time_start;
@@ -584,8 +584,8 @@ Ext.onReady(function(){
 		return unchkIcon;
 	}
 	var queryJson = new Object();
-	queryJson.V_LOGINNAME = V_LOGINNAME;
-	queryJson.V_PASSWORD =  V_PASSWORD;
+	// queryJson.V_LOGINNAME = V_LOGINNAME;
+	// queryJson.V_PASSWORD =  V_PASSWORD;
 	queryJson.COMMSTATUS = 'ONLY';
 	if((company_code!=null)&&(company_code!='null')&&(company_code.length>0))
 		queryJson.company_code = company_code;
@@ -737,8 +737,8 @@ Ext.onReady(function(){
 		        		$("#time_end").val('');
 		        	}
 //	        		query.clzt = Ext.getCmp('ff_clzt').getValue()==null?"":Ext.getCmp('ff_clzt').getValue();
-	        		query.V_LOGINNAME = V_LOGINNAME;
-	        		query.V_PASSWORD =  V_PASSWORD;
+// 	        		query.V_LOGINNAME = V_LOGINNAME;
+// 	        		query.V_PASSWORD =  V_PASSWORD;
 	        		query.COMMSTATUS = 'ONLY';
 		        	var jsonstr = Ext.JSON.encode(query);
 		        	myStore.getProxy().extraParams = {
@@ -893,8 +893,8 @@ Ext.onReady(function(){
 		    	var form = this.up('form').getForm();
 		        if (form.isValid()) {
 		        	var queryJson = new Object();
-		        	queryJson.V_LOGINNAME = V_LOGINNAME;
-		        	queryJson.V_PASSWORD = V_PASSWORD;
+		        	// queryJson.V_LOGINNAME = V_LOGINNAME;
+		        	// queryJson.V_PASSWORD = V_PASSWORD;
 		        	queryJson.id = Ext.getCmp('uf_id').getValue();
 		        	queryJson.status = Ext.getCmp('uf_status').getValue();
 		        	queryJson.name = Ext.getCmp('uf_name').getValue();

WebRoot/view/waterAlarm/scripts/waterOption.js

@@ -484,8 +484,8 @@ var draw_cycle_icon = function(icon_id,name, total, num, themecolor){
 
 var getCurrentData = function(){
 	var query = new Object();
-	query.V_LOGINNAME = V_LOGINNAME;
-	query.V_PASSWORD = V_PASSWORD;
+	// query.V_LOGINNAME = V_LOGINNAME;
+	// query.V_PASSWORD = V_PASSWORD;
 	query.dwtype='2';
 	query.COMMSTATUS = 'NO';
 	pieMask.show();
@@ -540,7 +540,7 @@ function exportbtn_click(){
 	    fields += '{id:"'+array[i]+'",title:"'+name[i]+'",shown:"'+true+'"}';
 	}
 			var query = new Object();
-			query.V_LOGINNAME = V_LOGINNAME;
+			// query.V_LOGINNAME = V_LOGINNAME;
 			query.company_code = company_code;
 			query.clzt = clzt;
 			query.time_start = time_start;
@@ -590,8 +590,8 @@ Ext.onReady(function(){
 		return unchkIcon;
 	}
 	var queryJson = new Object();
-	queryJson.V_LOGINNAME = V_LOGINNAME;
-	queryJson.V_PASSWORD =  V_PASSWORD;
+	// queryJson.V_LOGINNAME = V_LOGINNAME;
+	// queryJson.V_PASSWORD =  V_PASSWORD;
 	queryJson.COMMSTATUS = 'NO';
 	if((company_code!=null)&&(company_code!='null')&&(company_code.length>0))
 		queryJson.company_code = company_code;
@@ -744,8 +744,8 @@ Ext.onReady(function(){
 		        		$("#time_end").val('');
 		        	}
 //	        		query.clzt = Ext.getCmp('ff_clzt').getValue()==null?"":Ext.getCmp('ff_clzt').getValue();
-	        		query.V_LOGINNAME = V_LOGINNAME;
-	        		query.V_PASSWORD =  V_PASSWORD;
+// 	        		query.V_LOGINNAME = V_LOGINNAME;
+// 	        		query.V_PASSWORD =  V_PASSWORD;
 	        		query.COMMSTATUS = 'NO';
 		        	var jsonstr = Ext.JSON.encode(query);
 		        	myStore.getProxy().extraParams = {
@@ -900,8 +900,8 @@ Ext.onReady(function(){
 		    	var form = this.up('form').getForm();
 		        if (form.isValid()) {
 		        	var queryJson = new Object();
-		        	queryJson.V_LOGINNAME = V_LOGINNAME;
-		        	queryJson.V_PASSWORD = V_PASSWORD;
+		        	// queryJson.V_LOGINNAME = V_LOGINNAME;
+		        	// queryJson.V_PASSWORD = V_PASSWORD;
 		        	queryJson.id = Ext.getCmp('uf_id').getValue();
 		        	queryJson.status = Ext.getCmp('uf_status').getValue();
 		        	queryJson.name = Ext.getCmp('uf_name').getValue();

WebRoot/view/waterAlarm/scripts/waterSignal.js

@@ -507,8 +507,8 @@ var show_datapie = function(record){
 					var cid = e.currentTarget.company_code;
 					myMask.show();
 					var query = new Object();
-					query.V_LOGINNAME = V_LOGINNAME;
-					query.V_PASSWORD = V_PASSWORD;
+					// query.V_LOGINNAME = V_LOGINNAME;
+					// query.V_PASSWORD = V_PASSWORD;
 					query.company_code = cid;
 					query.device_id = id;
 					query.dwtype = '2';
@@ -738,8 +738,8 @@ Ext.onReady(function(){
 		return unchkIcon;
 	}
 	var queryJson = new Object();
-	queryJson.V_LOGINNAME = V_LOGINNAME;
-	queryJson.V_PASSWORD =  V_PASSWORD;
+	// queryJson.V_LOGINNAME = V_LOGINNAME;
+	// queryJson.V_PASSWORD =  V_PASSWORD;
 	queryJson.dwtype = '2';
 	queryJson.point_code = '3'
 	if((company_code!=null)&&(company_code!='null')&&(company_code.length>0))
@@ -846,8 +846,8 @@ Ext.onReady(function(){
 		        		company_code = null;
 		        	}
 	        		query.clzt = Ext.getCmp('ff_clzt').getValue()==null?"":Ext.getCmp('ff_clzt').getValue();
-	        		query.V_LOGINNAME = V_LOGINNAME;
-	        		query.V_PASSWORD =  V_PASSWORD;
+	        		// query.V_LOGINNAME = V_LOGINNAME;
+	        		// query.V_PASSWORD =  V_PASSWORD;
 	        		query.COMMSTATUS = 'NO';
 		        	var jsonstr = Ext.JSON.encode(query);
 		        	myStore.getProxy().extraParams = {
@@ -1002,8 +1002,8 @@ Ext.onReady(function(){
 		    	var form = this.up('form').getForm();
 		        if (form.isValid()) {
 		        	var queryJson = new Object();
-		        	queryJson.V_LOGINNAME = V_LOGINNAME;
-		        	queryJson.V_PASSWORD = V_PASSWORD;
+		        	// queryJson.V_LOGINNAME = V_LOGINNAME;
+		        	// queryJson.V_PASSWORD = V_PASSWORD;
 		        	queryJson.id = Ext.getCmp('uf_id').getValue();
 		        	queryJson.status = Ext.getCmp('uf_status').getValue();
 		        	queryJson.name = Ext.getCmp('uf_name').getValue();

WebRoot/view/waterAnalysis/scripts/projectWoker.js

@@ -16,8 +16,8 @@ Ext.onReady(function(){
 	$("#V_LOGINNAME").val(sessionStorage.getItem('V_LOGINNAME'));
 	$("#V_PASSWORD").val(sessionStorage.getItem('V_PASSWORD'));
 	var queryJson = new Object();
-	queryJson.V_LOGINNAME = $("#V_LOGINNAME").val();
-	queryJson.V_PASSWORD =  $("#V_PASSWORD").val();
+	// queryJson.V_LOGINNAME = $("#V_LOGINNAME").val();
+	// queryJson.V_PASSWORD =  $("#V_PASSWORD").val();
 	var draw_confirm = function(start_data,end_data,project_date){
 		var start_data = start_data;
 		var end_data = end_data;
@@ -1708,8 +1708,8 @@ Ext.onReady(function(){
 		    html:'<div style="overflow-y:auto;height:800px;width:640px;"><div id="woker_talk"></div></div>'
 		}).show();
 		var query = new Object();
-		query.V_LOGINNAME = $("#V_LOGINNAME").val();
-		query.V_PASSWORD = $("#V_PASSWORD").val();
+		// query.V_LOGINNAME = $("#V_LOGINNAME").val();
+		// query.V_PASSWORD = $("#V_PASSWORD").val();
 		query.start_data = start_data;
 		query.end_data = end_data;
 		query.build_code = build_code;

WebRoot/view/xhxx/scripts/xhxx.js

@@ -100,8 +100,8 @@ Ext.onReady(function(){
 
 
 	var queryJson = new Object();
-	queryJson.V_LOGINNAME = V_LOGINNAME;
-	queryJson.V_PASSWORD =  V_PASSWORD;
+	// queryJson.V_LOGINNAME = V_LOGINNAME;
+	// queryJson.V_PASSWORD =  V_PASSWORD;
 	queryJson.COMMSTATUS = 'NO';
 	if((company_code!=null)&&(company_code!='null')&&(company_code.length>0))
 		queryJson.company_code = company_code;	
@@ -323,8 +323,8 @@ Ext.onReady(function(){
 			query.xh = xh;
 			$("#xh").val(xh);
 		}
-		query.V_LOGINNAME = V_LOGINNAME;
-		query.V_PASSWORD =  V_PASSWORD;
+		// query.V_LOGINNAME = V_LOGINNAME;
+		// query.V_PASSWORD =  V_PASSWORD;
 		var jsonstr = Ext.JSON.encode(query);
     	myStore.getProxy().extraParams = {
     		queryJson : jsonstr
@@ -626,8 +626,8 @@ Ext.onReady(function(){
 		    html:'<div id="patrolplan_look_device"></div>'
 		}).show();
 		var query = new Object();
-		query.V_LOGINNAME = $("#V_LOGINNAME").val();
-		query.V_PASSWORD = $("#V_PASSWORD").val();
+		// query.V_LOGINNAME = $("#V_LOGINNAME").val();
+		// query.V_PASSWORD = $("#V_PASSWORD").val();
 		query.id = spot_id;
 		$.ajax({
 	        type:'POST',

src/cn/com/usky/iot/admin/service/YtiotTAdminServicesImpl.java

@@ -522,7 +522,7 @@ public class YtiotTAdminServicesImpl implements YtiotTAdminService {
 			ret.setV_LOGINNAME(V_LOGINNAME);
 			ret.setV_PASSWORD(V_PASSWORD);
 			hqlwhere = chkhw(hqlwhere)+" MD5(u."+fieldname("V_LOGINNAME")+") = '"+MD5Util.EncoderByMd5(V_LOGINNAME)+"' ";
-			hqlwhere = chkhw(hqlwhere)+" u."+fieldname("V_PASSWORD")+" = '"+MD5Util.EncoderByMd5(MD5Util.EncoderByMd5(V_PASSWORD))+"' ";
+			hqlwhere = chkhw(hqlwhere)+" u."+fieldname("V_PASSWORD")+" = '"+V_PASSWORD+"' ";
 			int totalCount = ytiotTAdminVerDao.getCount(hqlwhere);
 //			json.put("totalCount", totalCount);
 			if(totalCount>0) {

src/cn/com/usky/iot/alarm/service/YtiotVAlarmServiceImpl.java

@@ -2325,7 +2325,7 @@ public class YtiotVAlarmServiceImpl implements YtiotVAlarmService {
 		}
 		if((V_LOGINNAME!=null)&&(V_PASSWORD!=null)) {
 			List list = ytiotTAdminDao.query(" where MD5(u.VLoginname)='"+MD5Util.EncoderByMd5(V_LOGINNAME)+"' and u.VPassword='"
-					+MD5Util.EncoderByMd5(MD5Util.EncoderByMd5(V_PASSWORD))+"' ", null, null, null, null);
+					+V_PASSWORD+"' ", null, null, null, null);
 			if(list.size()>0) {
 				YtiotTAdmin o = (YtiotTAdmin)list.get(0);
 				E_STATUS = Integer.parseInt(o.getEStatus());
@@ -2600,7 +2600,7 @@ public class YtiotVAlarmServiceImpl implements YtiotVAlarmService {
 		}
 		if((V_LOGINNAME!=null)&&(V_PASSWORD!=null)) {
 			List list = ytiotTAdminDao.query(" where MD5(u.VLoginname)='"+MD5Util.EncoderByMd5(V_LOGINNAME)+"' and u.VPassword='"
-					+MD5Util.EncoderByMd5(MD5Util.EncoderByMd5(V_PASSWORD))+"' ", null, null, null, null);
+					+V_PASSWORD+"' ", null, null, null, null);
 			if(list.size()>0) {
 				YtiotTAdmin o = (YtiotTAdmin)list.get(0);
 				E_STATUS = Integer.parseInt(o.getEStatus());
@@ -2997,7 +2997,7 @@ public class YtiotVAlarmServiceImpl implements YtiotVAlarmService {
 		}
 		if((V_LOGINNAME!=null)&&(V_PASSWORD!=null)) {
 			List list = ytiotTAdminDao.query(" where MD5(u.VLoginname)='"+MD5Util.EncoderByMd5(V_LOGINNAME)+"' and u.VPassword='"
-					+MD5Util.EncoderByMd5(MD5Util.EncoderByMd5(V_PASSWORD))+"' ", null, null, null, null);
+					+V_PASSWORD+"' ", null, null, null, null);
 			if(list.size()>0) {
 				YtiotTAdmin o = (YtiotTAdmin)list.get(0);
 				E_STATUS = Integer.parseInt(o.getEStatus());
@@ -3113,7 +3113,7 @@ public class YtiotVAlarmServiceImpl implements YtiotVAlarmService {
 		}
 		if((V_LOGINNAME!=null)&&(V_PASSWORD!=null)) {
 			List list = ytiotTAdminDao.query(" where MD5(u.VLoginname)='"+MD5Util.EncoderByMd5(V_LOGINNAME)+"' and u.VPassword='"
-					+MD5Util.EncoderByMd5(MD5Util.EncoderByMd5(V_PASSWORD))+"' ", null, null, null, null);
+					+V_PASSWORD+"' ", null, null, null, null);
 			if(list.size()>0) {
 				YtiotTAdmin o = (YtiotTAdmin)list.get(0);
 				E_STATUS = Integer.parseInt(o.getEStatus());
@@ -3181,7 +3181,7 @@ public class YtiotVAlarmServiceImpl implements YtiotVAlarmService {
 		}
 		if((V_LOGINNAME!=null)&&(V_PASSWORD!=null)) {
 			List list = ytiotTAdminDao.query(" where MD5(u.VLoginname)='"+MD5Util.EncoderByMd5(V_LOGINNAME)+"' and u.VPassword='"
-					+MD5Util.EncoderByMd5(MD5Util.EncoderByMd5(V_PASSWORD))+"' ", null, null, null, null);
+					+V_PASSWORD+"' ", null, null, null, null);
 			if(list.size()>0) {
 				YtiotTAdmin o = (YtiotTAdmin)list.get(0);
 				E_STATUS = Integer.parseInt(o.getEStatus());
@@ -3250,7 +3250,7 @@ public class YtiotVAlarmServiceImpl implements YtiotVAlarmService {
 		}
 		if((V_LOGINNAME!=null)&&(V_PASSWORD!=null)) {
 			List list = ytiotTAdminDao.query(" where MD5(u.VLoginname)='"+MD5Util.EncoderByMd5(V_LOGINNAME)+"' and u.VPassword='"
-					+MD5Util.EncoderByMd5(MD5Util.EncoderByMd5(V_PASSWORD))+"' ", null, null, null, null);
+					+V_PASSWORD+"' ", null, null, null, null);
 			if(list.size()>0) {
 				YtiotTAdmin o = (YtiotTAdmin)list.get(0);
 				E_STATUS = Integer.parseInt(o.getEStatus());
@@ -3360,7 +3360,7 @@ public class YtiotVAlarmServiceImpl implements YtiotVAlarmService {
 		}
 		if((V_LOGINNAME!=null)&&(V_PASSWORD!=null)) {
 			List list = ytiotTAdminDao.query(" where MD5(u.VLoginname)='"+MD5Util.EncoderByMd5(V_LOGINNAME)+"' and u.VPassword='"
-					+MD5Util.EncoderByMd5(MD5Util.EncoderByMd5(V_PASSWORD))+"' ", null, null, null, null);
+					+V_PASSWORD+"' ", null, null, null, null);
 			if(list.size()>0) {
 				YtiotTAdmin o = (YtiotTAdmin)list.get(0);
 				E_STATUS = Integer.parseInt(o.getEStatus());
@@ -3434,7 +3434,7 @@ public class YtiotVAlarmServiceImpl implements YtiotVAlarmService {
 		}
 		if((V_LOGINNAME!=null)&&(V_PASSWORD!=null)) {
 			List list = ytiotTAdminDao.query(" where MD5(u.VLoginname)='"+MD5Util.EncoderByMd5(V_LOGINNAME)+"' and u.VPassword='"
-					+MD5Util.EncoderByMd5(MD5Util.EncoderByMd5(V_PASSWORD))+"' ", null, null, null, null);
+					+V_PASSWORD+"' ", null, null, null, null);
 			if(list.size()>0) {
 				YtiotTAdmin o = (YtiotTAdmin)list.get(0);
 				E_STATUS = Integer.parseInt(o.getEStatus());
@@ -3725,7 +3725,7 @@ public class YtiotVAlarmServiceImpl implements YtiotVAlarmService {
 		}
 		if((V_LOGINNAME!=null)&&(V_PASSWORD!=null)) {
 			List list = ytiotTAdminDao.query(" where MD5(u.VLoginname)='"+MD5Util.EncoderByMd5(V_LOGINNAME)+"' and u.VPassword='"
-					+MD5Util.EncoderByMd5(MD5Util.EncoderByMd5(V_PASSWORD))+"' ", null, null, null, null);
+					+V_PASSWORD+"' ", null, null, null, null);
 			if(list.size()>0) {
 				YtiotTAdmin o = (YtiotTAdmin)list.get(0);
 				E_STATUS = Integer.parseInt(o.getEStatus());

src/cn/com/usky/iot/company/service/YtiotVCompanyServiceImpl.java

@@ -502,7 +502,7 @@ public class YtiotVCompanyServiceImpl implements YtiotVCompanyService {
 		}
 		if((V_LOGINNAME!=null)&&(V_PASSWORD!=null)) {
 			List list = ytiotTAdminDao.query(" where u.VLoginname='"+V_LOGINNAME+"' and u.VPassword='"
-					+MD5Util.EncoderByMd5(MD5Util.EncoderByMd5(V_PASSWORD))+"' ", null, null, null, null);
+					+V_PASSWORD+"' ", null, null, null, null);
 			if(list.size()>0) {
 				YtiotTAdmin o = (YtiotTAdmin)list.get(0);
 				E_STATUS = Integer.parseInt(o.getEStatus());

src/cn/com/usky/iot/controller/AdminController.java

@@ -5,7 +5,14 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 
+import cn.com.usky.iot.auth.TokenAuthBO;
+import cn.com.usky.iot.auth.TokenAuthService;
+import cn.com.usky.iot.controller.login.Constants;
+import cn.com.usky.iot.entity.YtiotTAdmin;
+import cn.com.usky.utils.HttpServletRequestUtils;
+import com.alibaba.fastjson.JSONObject;
 import org.apache.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -34,18 +41,33 @@ public class AdminController {
 		 adminController.ytiotTAdminService = this.ytiotTAdminService;
 	 }
 
+	@Autowired
+	private TokenAuthService tokenAuthService;
 	@RequestMapping(value="/getList",method= {RequestMethod.GET,RequestMethod.POST})
 	public ModelAndView  getList(@RequestParam(value = "queryJson", required = false) String queryJson,
 			@RequestParam(value = "page", required = false) String page,
 			@RequestParam(value = "start", required = false) String start,
 			@RequestParam(value = "limit", required = false) String limit,
-			@RequestParam(value = "sort", required = false) String sort) {
+			@RequestParam(value = "sort", required = false) String sort,
+								 HttpServletRequest request) {
 		// TODO Auto-generated constructor stub
 		ModelAndView mav = new ModelAndView();
+		TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+		boolean isAuth = tokenAuthBO.isAuthState();
+		if (!isAuth) {
+			JSONObject json = new JSONObject();
+			json.put("check", false);
+			json.put("errMsg", "权限错误，请重新登录");
+			mav.addObject("ret_str", json.toJSONString());
+		}
 		mav.setViewName("return");
-//		System.out.println(queryJson);
+		//通过获取用户信息
+		YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+		JSONObject jsonObject = JSONObject.parseObject(queryJson);
+		jsonObject.put("V_LOGINNAME", o.getVLoginname());
+		jsonObject.put("V_PASSWORD", o.getVPassword());
 		try {
-			String ret = adminController.ytiotTAdminService.getAdminList(queryJson,page,start,limit,sort);
+			String ret = adminController.ytiotTAdminService.getAdminList(jsonObject.toString(),page,start,limit,sort);
 //			System.out.println(ret);
 			mav.addObject("ret_str", ret);
 			
@@ -60,13 +82,26 @@ public class AdminController {
 			@RequestParam(value = "page", required = false) String page,
 			@RequestParam(value = "start", required = false) String start,
 			@RequestParam(value = "limit", required = false) String limit,
-			@RequestParam(value = "sort", required = false) String sort) {
+			@RequestParam(value = "sort", required = false) String sort,
+									HttpServletRequest request) {
 		// TODO Auto-generated constructor stub
 		ModelAndView mav = new ModelAndView();
+		TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+		boolean isAuth = tokenAuthBO.isAuthState();
+		if (!isAuth) {
+			JSONObject json = new JSONObject();
+			json.put("check", false);
+			json.put("errMsg", "权限错误，请重新登录");
+			mav.addObject("ret_str", json.toJSONString());
+		}
 		mav.setViewName("return");
-		//System.out.println(queryJson);
+		//通过获取用户信息
+		YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+		JSONObject jsonObject = JSONObject.parseObject(queryJson);
+		jsonObject.put("V_LOGINNAME", o.getVLoginname());
+		jsonObject.put("V_PASSWORD", o.getVPassword());
 		try {
-			String ret = adminController.ytiotTAdminService.getAdminVerList(queryJson,page,start,limit,sort);
+			String ret = adminController.ytiotTAdminService.getAdminVerList(jsonObject.toString(),page,start,limit,sort);
 			//System.out.println(ret);
 			mav.addObject("ret_str", ret);
 			
@@ -77,12 +112,25 @@ public class AdminController {
 		return mav;
 	}
 	@RequestMapping(value="/append",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView append(@RequestParam(value = "queryJson", required = false) String queryJson) {
+	public ModelAndView append(@RequestParam(value = "queryJson", required = false) String queryJson,
+							   HttpServletRequest request) {
 		ModelAndView mav = new ModelAndView();
+		TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+		boolean isAuth = tokenAuthBO.isAuthState();
+		if (!isAuth) {
+			JSONObject json = new JSONObject();
+			json.put("check", false);
+			json.put("errMsg", "权限错误，请重新登录");
+			mav.addObject("ret_str", json.toJSONString());
+		}
 		mav.setViewName("return");
-//		System.out.println(queryJson);
+		//通过获取用户信息
+		YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+		JSONObject jsonObject = JSONObject.parseObject(queryJson);
+		jsonObject.put("V_LOGINNAME", o.getVLoginname());
+		jsonObject.put("V_PASSWORD", o.getVPassword());
 		try {
-			String ret = adminController.ytiotTAdminService.appendAdmin(queryJson);
+			String ret = adminController.ytiotTAdminService.appendAdmin(jsonObject.toString());
 			mav.addObject("ret_str",ret);
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -90,12 +138,25 @@ public class AdminController {
 		return mav;
 	}
 	@RequestMapping(value="/update",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView update(@RequestParam(value = "queryJson", required = false) String queryJson) {
+	public ModelAndView update(@RequestParam(value = "queryJson", required = false) String queryJson,
+							   HttpServletRequest request) {
 		ModelAndView mav = new ModelAndView();
+		TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+		boolean isAuth = tokenAuthBO.isAuthState();
+		if (!isAuth) {
+			JSONObject json = new JSONObject();
+			json.put("check", false);
+			json.put("errMsg", "权限错误，请重新登录");
+			mav.addObject("ret_str", json.toJSONString());
+		}
 		mav.setViewName("return");
-//		System.out.println(queryJson);
+		//通过获取用户信息
+		YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+		JSONObject jsonObject = JSONObject.parseObject(queryJson);
+		jsonObject.put("V_LOGINNAME", o.getVLoginname());
+		jsonObject.put("V_PASSWORD", o.getVPassword());
 		try {
-			String ret = adminController.ytiotTAdminService.updateAdmin(queryJson);
+			String ret = adminController.ytiotTAdminService.updateAdmin(jsonObject.toString());
 			mav.addObject("ret_str",ret);
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -103,12 +164,25 @@ public class AdminController {
 		return mav;
 	}
 	@RequestMapping(value="/delete",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView delete(@RequestParam(value = "queryJson", required = false) String queryJson) {
+	public ModelAndView delete(@RequestParam(value = "queryJson", required = false) String queryJson,
+							   HttpServletRequest request) {
 		ModelAndView mav = new ModelAndView();
+		TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+		boolean isAuth = tokenAuthBO.isAuthState();
+		if (!isAuth) {
+			JSONObject json = new JSONObject();
+			json.put("check", false);
+			json.put("errMsg", "权限错误，请重新登录");
+			mav.addObject("ret_str", json.toJSONString());
+		}
 		mav.setViewName("return");
-		//System.out.println(queryJson);
+		//通过获取用户信息
+		YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+		JSONObject jsonObject = JSONObject.parseObject(queryJson);
+		jsonObject.put("V_LOGINNAME", o.getVLoginname());
+		jsonObject.put("V_PASSWORD", o.getVPassword());
 		try {
-			String ret = adminController.ytiotTAdminService.deleteAdmin(queryJson);
+			String ret = adminController.ytiotTAdminService.deleteAdmin(jsonObject.toString());
 			mav.addObject("ret_str",ret);
 		} catch (Exception e) {
 			e.printStackTrace();

src/cn/com/usky/iot/controller/AlarmViewController.java

@@ -2,7 +2,15 @@ package cn.com.usky.iot.controller;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 
+import cn.com.usky.iot.auth.TokenAuthBO;
+import cn.com.usky.iot.auth.TokenAuthService;
+import cn.com.usky.iot.controller.login.Constants;
+import cn.com.usky.iot.entity.YtiotTAdmin;
+import cn.com.usky.utils.HttpServletRequestUtils;
+import com.alibaba.fastjson.JSONObject;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -15,383 +23,630 @@ import cn.com.usky.iot.alarm.service.YtiotVAlarmService;
 @RequestMapping("/iot/alarm/view")
 public class AlarmViewController {
 
-	@Resource
-	private YtiotVAlarmService ytiotVAlarmService;
-	private static AlarmViewController alarmViewController;
-	
-	@PostConstruct
-	 public void init() {
-		alarmViewController = this;
-		alarmViewController.ytiotVAlarmService = this.ytiotVAlarmService;
-	}
-	
-	@RequestMapping(value="/getEFireList",method= {RequestMethod.GET,RequestMethod.POST})
-	public static ModelAndView  getEFireList(@RequestParam(value = "queryJson", required = false) String queryJson,
-			@RequestParam(value = "page", required = false) String page,
-			@RequestParam(value = "start", required = false) String start,
-			@RequestParam(value = "limit", required = false) String limit,
-			@RequestParam(value = "sort", required = false) String sort) {
-		// TODO Auto-generated constructor stub
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret = alarmViewController.ytiotVAlarmService.getEFireVList(queryJson, page, start, limit, sort);
+    @Resource
+    private YtiotVAlarmService ytiotVAlarmService;
+    private static AlarmViewController alarmViewController;
+
+    @PostConstruct
+    public void init() {
+        alarmViewController = this;
+        alarmViewController.ytiotVAlarmService = this.ytiotVAlarmService;
+    }
+
+    @Autowired
+    private TokenAuthService tokenAuthService;
+
+    @RequestMapping(value = "/getEFireList", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView getEFireList(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                     @RequestParam(value = "page", required = false) String page,
+                                     @RequestParam(value = "start", required = false) String start,
+                                     @RequestParam(value = "limit", required = false) String limit,
+                                     @RequestParam(value = "sort", required = false) String sort,
+                                     HttpServletRequest request) {
+        // TODO Auto-generated constructor stub
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            JSONObject json = new JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        JSONObject jsonObject = JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = alarmViewController.ytiotVAlarmService.getEFireVList(jsonObject.toString(), page, start, limit, sort);
 //			System.out.println(ret);
-			mav.addObject("ret_str", ret);
-			
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-	@RequestMapping(value="/getHJList",method= {RequestMethod.GET,RequestMethod.POST})
-	public static ModelAndView  getHJList(@RequestParam(value = "queryJson", required = false) String queryJson,
-			@RequestParam(value = "page", required = false) String page,
-			@RequestParam(value = "start", required = false) String start,
-			@RequestParam(value = "limit", required = false) String limit,
-			@RequestParam(value = "sort", required = false) String sort) {
-		// TODO Auto-generated constructor stub
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret = alarmViewController.ytiotVAlarmService.getHjVList(queryJson,page,start,limit,sort);
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/getHJList", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView getHJList(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                  @RequestParam(value = "page", required = false) String page,
+                                  @RequestParam(value = "start", required = false) String start,
+                                  @RequestParam(value = "limit", required = false) String limit,
+                                  @RequestParam(value = "sort", required = false) String sort,
+                                  HttpServletRequest request) {
+        // TODO Auto-generated constructor stub
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            JSONObject json = new JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        JSONObject jsonObject = JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = alarmViewController.ytiotVAlarmService.getHjVList(jsonObject.toString(), page, start, limit, sort);
 //			System.out.println(ret);
-			mav.addObject("ret_str", ret);
-			
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-	@RequestMapping(value="/getLiftList",method= {RequestMethod.GET,RequestMethod.POST})
-	public static ModelAndView  getLiftList(@RequestParam(value = "queryJson", required = false) String queryJson,
-			@RequestParam(value = "page", required = false) String page,
-			@RequestParam(value = "start", required = false) String start,
-			@RequestParam(value = "limit", required = false) String limit,
-			@RequestParam(value = "sort", required = false) String sort) {
-		// TODO Auto-generated constructor stub
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret = alarmViewController.ytiotVAlarmService.getLiftVList(queryJson,page,start,limit,sort);
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/getLiftList", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView getLiftList(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                    @RequestParam(value = "page", required = false) String page,
+                                    @RequestParam(value = "start", required = false) String start,
+                                    @RequestParam(value = "limit", required = false) String limit,
+                                    @RequestParam(value = "sort", required = false) String sort,
+                                    HttpServletRequest request) {
+        // TODO Auto-generated constructor stub
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            JSONObject json = new JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        JSONObject jsonObject = JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = alarmViewController.ytiotVAlarmService.getLiftVList(jsonObject.toString(), page, start, limit, sort);
 //			System.out.println(ret);
-			mav.addObject("ret_str", ret);
-			
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-	@RequestMapping(value="/getSJList",method= {RequestMethod.GET,RequestMethod.POST})
-	public static ModelAndView  getSJList(@RequestParam(value = "queryJson", required = false) String queryJson,
-			@RequestParam(value = "page", required = false) String page,
-			@RequestParam(value = "start", required = false) String start,
-			@RequestParam(value = "limit", required = false) String limit,
-			@RequestParam(value = "sort", required = false) String sort) {
-		// TODO Auto-generated constructor stub
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret = alarmViewController.ytiotVAlarmService.getSjVList(queryJson,page,start,limit,sort);
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/getSJList", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView getSJList(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                  @RequestParam(value = "page", required = false) String page,
+                                  @RequestParam(value = "start", required = false) String start,
+                                  @RequestParam(value = "limit", required = false) String limit,
+                                  @RequestParam(value = "sort", required = false) String sort,
+                                  HttpServletRequest request) {
+        // TODO Auto-generated constructor stub
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            JSONObject json = new JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        JSONObject jsonObject = JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = alarmViewController.ytiotVAlarmService.getSjVList(jsonObject.toString(), page, start, limit, sort);
 //			System.out.println(ret);
-			mav.addObject("ret_str", ret);
-			
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-	@RequestMapping(value="/getRTUList",method= {RequestMethod.GET,RequestMethod.POST})
-	public static ModelAndView  getRTUList(@RequestParam(value = "queryJson", required = false) String queryJson,
-			@RequestParam(value = "page", required = false) String page,
-			@RequestParam(value = "start", required = false) String start,
-			@RequestParam(value = "limit", required = false) String limit,
-			@RequestParam(value = "sort", required = false) String sort) {
-		// TODO Auto-generated constructor stub
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret = alarmViewController.ytiotVAlarmService.getRtuVList(queryJson,page,start,limit,sort);
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/getRTUList", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView getRTUList(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                   @RequestParam(value = "page", required = false) String page,
+                                   @RequestParam(value = "start", required = false) String start,
+                                   @RequestParam(value = "limit", required = false) String limit,
+                                   @RequestParam(value = "sort", required = false) String sort,
+                                   HttpServletRequest request) {
+        // TODO Auto-generated constructor stub
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            JSONObject json = new JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        JSONObject jsonObject = JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = alarmViewController.ytiotVAlarmService.getRtuVList(jsonObject.toString(), page, start, limit, sort);
 //			System.out.println(ret);
-			mav.addObject("ret_str", ret);
-			
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
-
-	@RequestMapping(value="/getConfirmStatus",method= {RequestMethod.GET,RequestMethod.POST})
-	public static ModelAndView  getConfirmStatus(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		// TODO Auto-generated constructor stub
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret = alarmViewController.ytiotVAlarmService.getConfirmStatus(queryJson);
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/getConfirmStatus", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView getConfirmStatus(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                         HttpServletRequest request) {
+        // TODO Auto-generated constructor stub
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            JSONObject json = new JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        JSONObject jsonObject = JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = alarmViewController.ytiotVAlarmService.getConfirmStatus(jsonObject.toString());
 //			System.out.println(ret);
-			mav.addObject("ret_str", ret);
-			
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	@RequestMapping(value="/getConfirmStatusByDays",method= {RequestMethod.GET,RequestMethod.POST})
-	public static ModelAndView  getConfirmStatusByDays(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		// TODO Auto-generated constructor stub
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret = alarmViewController.ytiotVAlarmService.getConfirmStatusByDays(queryJson);
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/getConfirmStatusByDays", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView getConfirmStatusByDays(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                               HttpServletRequest request) {
+        // TODO Auto-generated constructor stub
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            JSONObject json = new JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        JSONObject jsonObject = JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = alarmViewController.ytiotVAlarmService.getConfirmStatusByDays(jsonObject.toString());
 //			System.out.println(ret);
-			mav.addObject("ret_str", ret);
-			
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-	@RequestMapping(value="/getVideoList",method= {RequestMethod.GET,RequestMethod.POST})
-	public static ModelAndView  getVideoList(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		// TODO Auto-generated constructor stub
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-		try {
-			String ret = alarmViewController.ytiotVAlarmService.getVideoList(queryJson);
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/getVideoList", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView getVideoList(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                     HttpServletRequest request) {
+        // TODO Auto-generated constructor stub
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            JSONObject json = new JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        JSONObject jsonObject = JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = alarmViewController.ytiotVAlarmService.getVideoList(jsonObject.toString());
 //			System.out.println(ret);
-			mav.addObject("ret_str", ret);
-			
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
-
-
-	/**
-	 * 获取视频告警
-	 * @param queryJson
-	 * @param page
-	 * @param start
-	 * @param limit
-	 * @param sort
-	 * @return
-	 */
-	@RequestMapping(value="/getVideoLists",method= {RequestMethod.GET,RequestMethod.POST})
-	public static ModelAndView  getVideoList(@RequestParam(value = "queryJson", required = false) String queryJson,
-											 @RequestParam(value = "page", required = false) String page,
-											 @RequestParam(value = "start", required = false) String start,
-											 @RequestParam(value = "limit", required = false) String limit,
-											 @RequestParam(value = "sort", required = false) String sort) {
-		// TODO Auto-generated constructor stub
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-		try {
-			String ret = alarmViewController.ytiotVAlarmService.getVideoLists(queryJson,page,start,limit,sort);
-			mav.addObject("ret_str", ret);
-
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
-
-	
-	@RequestMapping(value="/updateHj",method= {RequestMethod.GET,RequestMethod.POST})
-	public static ModelAndView  updateHj(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		// TODO Auto-generated constructor stub
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret = alarmViewController.ytiotVAlarmService.updateHj(queryJson);
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+
+    /**
+     * 获取视频告警
+     *
+     * @param queryJson
+     * @param page
+     * @param start
+     * @param limit
+     * @param sort
+     * @return
+     */
+    @RequestMapping(value = "/getVideoLists", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView getVideoList(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                     @RequestParam(value = "page", required = false) String page,
+                                     @RequestParam(value = "start", required = false) String start,
+                                     @RequestParam(value = "limit", required = false) String limit,
+                                     @RequestParam(value = "sort", required = false) String sort,
+                                     HttpServletRequest request) {
+        // TODO Auto-generated constructor stub
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            JSONObject json = new JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        JSONObject jsonObject = JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = alarmViewController.ytiotVAlarmService.getVideoLists(jsonObject.toString(), page, start, limit, sort);
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+
+    @RequestMapping(value = "/updateHj", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView updateHj(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                 HttpServletRequest request) {
+        // TODO Auto-generated constructor stub
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            JSONObject json = new JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        JSONObject jsonObject = JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = alarmViewController.ytiotVAlarmService.updateHj(jsonObject.toString());
 //			System.out.println(ret);
-			mav.addObject("ret_str", ret);
-			
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-	@RequestMapping(value="/updateLift",method= {RequestMethod.GET,RequestMethod.POST})
-	public static ModelAndView  updateLift(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		// TODO Auto-generated constructor stub
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret = alarmViewController.ytiotVAlarmService.updateLift(queryJson);
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/updateLift", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView updateLift(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                   HttpServletRequest request) {
+        // TODO Auto-generated constructor stub
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            JSONObject json = new JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        JSONObject jsonObject = JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = alarmViewController.ytiotVAlarmService.updateLift(jsonObject.toString());
 //			System.out.println(ret);
-			mav.addObject("ret_str", ret);
-			
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-	@RequestMapping(value="/updateEf",method= {RequestMethod.GET,RequestMethod.POST})
-	public static ModelAndView  updateEf(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		// TODO Auto-generated constructor stub
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret = alarmViewController.ytiotVAlarmService.updateEf(queryJson);
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/updateEf", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView updateEf(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                 HttpServletRequest request) {
+        // TODO Auto-generated constructor stub
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            JSONObject json = new JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        JSONObject jsonObject = JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = alarmViewController.ytiotVAlarmService.updateEf(jsonObject.toString());
 //			System.out.println(ret);
-			mav.addObject("ret_str", ret);
-			
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-	@RequestMapping(value="/updateSj",method= {RequestMethod.GET,RequestMethod.POST})
-	public static ModelAndView  updateSj(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		// TODO Auto-generated constructor stub
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret = alarmViewController.ytiotVAlarmService.updateSj(queryJson);
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/updateSj", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView updateSj(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                 HttpServletRequest request) {
+        // TODO Auto-generated constructor stub
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            JSONObject json = new JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        JSONObject jsonObject = JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = alarmViewController.ytiotVAlarmService.updateSj(jsonObject.toString());
 //			System.out.println(ret);
-			mav.addObject("ret_str", ret);
-			
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	@RequestMapping(value="/updateRtu",method= {RequestMethod.GET,RequestMethod.POST})
-	public static ModelAndView  updateRtu(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		// TODO Auto-generated constructor stub
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret = alarmViewController.ytiotVAlarmService.updateRtu(queryJson);
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/updateRtu", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView updateRtu(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                  HttpServletRequest request) {
+        // TODO Auto-generated constructor stub
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            JSONObject json = new JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        JSONObject jsonObject = JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = alarmViewController.ytiotVAlarmService.updateRtu(jsonObject.toString());
 //			System.out.println(ret);
-			mav.addObject("ret_str", ret);
-			
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
-
-	/**
-	 * 修改视频告警状态
-	 * @param queryJson
-	 * @return
-	 */
-	@RequestMapping(value="/updateVideo",method= {RequestMethod.GET,RequestMethod.POST})
-	public static ModelAndView  updateVideo(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-		try {
-			String ret = alarmViewController.ytiotVAlarmService.updateVideo(queryJson);
-			mav.addObject("ret_str", ret);
-
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-
-	/**
-	 * 修改视频设备离线告警
-	 * @param queryJson
-	 * @return
-	 */
-	@RequestMapping(value="/updateVideoOffline ",method= {RequestMethod.GET,RequestMethod.POST})
-	public static ModelAndView  updateVideoOffline(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-		try {
-			//String ret = alarmViewController.ytiotVAlarmService.updateVideo(queryJson);
-			String ret = alarmViewController.ytiotVAlarmService.updateVideoOffline(queryJson);
-			mav.addObject("ret_str", ret);
-
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-
-	/**
-	 * 获取视频设备离线数据
-	 * @param queryJson
-	 * @return
-	 */
-	@RequestMapping(value="/getVideoOfflineList",method= {RequestMethod.GET,RequestMethod.POST})
-	public static ModelAndView  getVideoOfflineList(@RequestParam(value = "queryJson", required = false) String queryJson,
-											 @RequestParam(value = "page", required = false) String page,
-											 @RequestParam(value = "start", required = false) String start,
-											 @RequestParam(value = "limit", required = false) String limit,
-											 @RequestParam(value = "sort", required = false) String sort) {
-		// TODO Auto-generated constructor stub
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-		try {
-			String ret = alarmViewController.ytiotVAlarmService.getVideoOfflineList(queryJson,page,start,limit,sort);
-			mav.addObject("ret_str", ret);
-
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
-
-	/**
-	 *
-	 * @param queryJson
-	 * @return
-	 */
-	@RequestMapping(value="/hiddenDanger",method= {RequestMethod.GET,RequestMethod.POST})
-	public static ModelAndView  hiddenDanger(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		// TODO Auto-generated constructor stub
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret = alarmViewController.ytiotVAlarmService.getConfirmStatusByDays(queryJson);
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    /**
+     * 修改视频告警状态
+     *
+     * @param queryJson
+     * @return
+     */
+    @RequestMapping(value = "/updateVideo", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView updateVideo(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                    HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            JSONObject json = new JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        JSONObject jsonObject = JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = alarmViewController.ytiotVAlarmService.updateVideo(jsonObject.toString());
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    /**
+     * 修改视频设备离线告警
+     *
+     * @param queryJson
+     * @return
+     */
+    @RequestMapping(value = "/updateVideoOffline ", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView updateVideoOffline(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                           HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            JSONObject json = new JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        JSONObject jsonObject = JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            //String ret = alarmViewController.ytiotVAlarmService.updateVideo(queryJson);
+            String ret = alarmViewController.ytiotVAlarmService.updateVideoOffline(jsonObject.toString());
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    /**
+     * 获取视频设备离线数据
+     *
+     * @param queryJson
+     * @return
+     */
+    @RequestMapping(value = "/getVideoOfflineList", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView getVideoOfflineList(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                            @RequestParam(value = "page", required = false) String page,
+                                            @RequestParam(value = "start", required = false) String start,
+                                            @RequestParam(value = "limit", required = false) String limit,
+                                            @RequestParam(value = "sort", required = false) String sort,
+                                            HttpServletRequest request) {
+        // TODO Auto-generated constructor stub
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            JSONObject json = new JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        JSONObject jsonObject = JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = alarmViewController.ytiotVAlarmService.getVideoOfflineList(jsonObject.toString(), page, start, limit, sort);
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    /**
+     * @param queryJson
+     * @return
+     */
+    @RequestMapping(value = "/hiddenDanger", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView hiddenDanger(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                     HttpServletRequest request) {
+        // TODO Auto-generated constructor stub
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            JSONObject json = new JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        JSONObject jsonObject = JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = alarmViewController.ytiotVAlarmService.getConfirmStatusByDays(jsonObject.toString());
 //			System.out.println(ret);
-			mav.addObject("ret_str", ret);
-
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
 
 }

src/cn/com/usky/iot/controller/AnalysisViewController.java

@@ -2,7 +2,15 @@ package cn.com.usky.iot.controller;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 
+import cn.com.usky.iot.auth.TokenAuthBO;
+import cn.com.usky.iot.auth.TokenAuthService;
+import cn.com.usky.iot.controller.login.Constants;
+import cn.com.usky.iot.entity.YtiotTAdmin;
+import cn.com.usky.utils.HttpServletRequestUtils;
+import com.alibaba.fastjson.JSONObject;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -14,67 +22,95 @@ import cn.com.usky.iot.EfAnalysis.service.YtiotTEfAnalysisService;
 @Controller
 @RequestMapping("/iot/analysis/view")
 public class AnalysisViewController {
-	
-	@Resource
-	private YtiotTEfAnalysisService ytiotTEfAnalysisService;
-	private static AnalysisViewController analysisViewController;
-	
-	@PostConstruct
-	 public void init() {
-		analysisViewController = this;
-		analysisViewController.ytiotTEfAnalysisService = this.ytiotTEfAnalysisService;
-	}
-	
-	@RequestMapping(value="/getEfAnalysisList",method= {RequestMethod.GET,RequestMethod.POST})
-	public static ModelAndView  getEfAnalysisList(@RequestParam(value = "queryJson", required = false) String queryJson,
-			@RequestParam(value = "page", required = false) String page,
-			@RequestParam(value = "start", required = false) String start,
-			@RequestParam(value = "limit", required = false) String limit,
-			@RequestParam(value = "sort", required = false) String sort) {
-		// TODO Auto-generated constructor stub
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
+
+    @Resource
+    private YtiotTEfAnalysisService ytiotTEfAnalysisService;
+    private static AnalysisViewController analysisViewController;
+
+    @PostConstruct
+    public void init() {
+        analysisViewController = this;
+        analysisViewController.ytiotTEfAnalysisService = this.ytiotTEfAnalysisService;
+    }
+
+    @Autowired
+    private TokenAuthService tokenAuthService;
+
+    @RequestMapping(value = "/getEfAnalysisList", method = {RequestMethod.GET, RequestMethod.POST})
+    public  ModelAndView getEfAnalysisList(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                                 @RequestParam(value = "page", required = false) String page,
+                                                 @RequestParam(value = "start", required = false) String start,
+                                                 @RequestParam(value = "limit", required = false) String limit,
+                                                 @RequestParam(value = "sort", required = false) String sort,
+                                                 HttpServletRequest request) {
+        // TODO Auto-generated constructor stub
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            JSONObject json = new JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        JSONObject jsonObject = JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
 //			System.out.println(queryJson);
-			if(analysisViewController.ytiotTEfAnalysisService==null)
-			{
-				System.out.println("Service is NULL");
-			}
-			String ret = analysisViewController.ytiotTEfAnalysisService.getEfAnalysisList(queryJson,page,start,limit,sort);
+            if (analysisViewController.ytiotTEfAnalysisService == null) {
+                System.out.println("Service is NULL");
+            }
+            String ret = analysisViewController.ytiotTEfAnalysisService.getEfAnalysisList(jsonObject.toString(), page, start, limit, sort);
 //			System.out.println(ret);
-			mav.addObject("ret_str", ret);
-			
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	@RequestMapping(value="/getWaterAnalysisList",method= {RequestMethod.GET,RequestMethod.POST})
-	public static ModelAndView  getWaterAnalysisList(@RequestParam(value = "queryJson", required = false) String queryJson,
-			@RequestParam(value = "page", required = false) String page,
-			@RequestParam(value = "start", required = false) String start,
-			@RequestParam(value = "limit", required = false) String limit,
-			@RequestParam(value = "sort", required = false) String sort) {
-		// TODO Auto-generated constructor stub
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/getWaterAnalysisList", method = {RequestMethod.GET, RequestMethod.POST})
+    public  ModelAndView getWaterAnalysisList(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                                    @RequestParam(value = "page", required = false) String page,
+                                                    @RequestParam(value = "start", required = false) String start,
+                                                    @RequestParam(value = "limit", required = false) String limit,
+                                                    @RequestParam(value = "sort", required = false) String sort,
+                                                    HttpServletRequest request) {
+        // TODO Auto-generated constructor stub
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            JSONObject json = new JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        JSONObject jsonObject = JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
 //			System.out.println(queryJson);
-			if(analysisViewController.ytiotTEfAnalysisService==null)
-			{
-				System.out.println("Service is NULL");
-			}
-			String ret = analysisViewController.ytiotTEfAnalysisService.getWaterAnalysisList(queryJson,page,start,limit,sort);
+            if (analysisViewController.ytiotTEfAnalysisService == null) {
+                System.out.println("Service is NULL");
+            }
+            String ret = analysisViewController.ytiotTEfAnalysisService.getWaterAnalysisList(jsonObject.toString(), page, start, limit, sort);
 //			System.out.println(ret);
-			mav.addObject("ret_str", ret);
-			
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
 }

src/cn/com/usky/iot/controller/AreaController.java

@@ -2,7 +2,15 @@ package cn.com.usky.iot.controller;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 
+import cn.com.usky.iot.auth.TokenAuthBO;
+import cn.com.usky.iot.auth.TokenAuthService;
+import cn.com.usky.iot.controller.login.Constants;
+import cn.com.usky.iot.entity.YtiotTAdmin;
+import cn.com.usky.utils.HttpServletRequestUtils;
+import com.alibaba.fastjson.JSONObject;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -10,167 +18,278 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.servlet.ModelAndView;
 
 import cn.com.usky.iot.area.service.YtiotTAreaService;
+
 @Controller
 @RequestMapping("/iot/area")
 public class AreaController {
-	@Resource
-	private YtiotTAreaService ytiotTAreaService;
-	
-	private static AreaController AreaController;
-	
-	
-	 @PostConstruct
-	 public void init() {
-		 AreaController = this;
-		 AreaController.ytiotTAreaService = this.ytiotTAreaService;
-	 }
-
-	@RequestMapping(value="/getList",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView  getList(@RequestParam(value = "queryJson", required = false) String queryJson,
-			@RequestParam(value = "page", required = false) String page,
-			@RequestParam(value = "start", required = false) String start,
-			@RequestParam(value = "limit", required = false) String limit,
-			@RequestParam(value = "sort", required = false) String sort) {
-		// TODO Auto-generated constructor stub
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret = AreaController.ytiotTAreaService.getAreaList(queryJson,page,start,limit,sort);
+    @Resource
+    private YtiotTAreaService ytiotTAreaService;
+
+    private static AreaController AreaController;
+
+
+    @PostConstruct
+    public void init() {
+        AreaController = this;
+        AreaController.ytiotTAreaService = this.ytiotTAreaService;
+    }
+
+    @Autowired
+    private TokenAuthService tokenAuthService;
+
+    @RequestMapping(value = "/getList", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView getList(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                @RequestParam(value = "page", required = false) String page,
+                                @RequestParam(value = "start", required = false) String start,
+                                @RequestParam(value = "limit", required = false) String limit,
+                                @RequestParam(value = "sort", required = false) String sort,
+                                HttpServletRequest request) {
+        // TODO Auto-generated constructor stub
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            JSONObject json = new JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        JSONObject jsonObject = JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = AreaController.ytiotTAreaService.getAreaList(jsonObject.toString(), page, start, limit, sort);
 //			System.out.println(ret);
-			mav.addObject("ret_str", ret);
-			
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-	@RequestMapping(value="/getProvince",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView  getProvince(@RequestParam(value = "queryJson", required = false) String queryJson,
-			@RequestParam(value = "page", required = false) String page,
-			@RequestParam(value = "start", required = false) String start,
-			@RequestParam(value = "limit", required = false) String limit,
-			@RequestParam(value = "sort", required = false) String sort) {
-		// TODO Auto-generated constructor stub
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret = AreaController.ytiotTAreaService.getProvince(queryJson,page,start,limit,sort);
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/getProvince", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView getProvince(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                    @RequestParam(value = "page", required = false) String page,
+                                    @RequestParam(value = "start", required = false) String start,
+                                    @RequestParam(value = "limit", required = false) String limit,
+                                    @RequestParam(value = "sort", required = false) String sort,
+                                    HttpServletRequest request) {
+        // TODO Auto-generated constructor stub
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            JSONObject json = new JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        JSONObject jsonObject = JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = AreaController.ytiotTAreaService.getProvince(jsonObject.toString(), page, start, limit, sort);
 //			System.out.println(ret);
-			mav.addObject("ret_str", ret);
-			
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-	@RequestMapping(value="/getCity",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView  getCity(@RequestParam(value = "queryJson", required = false) String queryJson,
-			@RequestParam(value = "page", required = false) String page,
-			@RequestParam(value = "start", required = false) String start,
-			@RequestParam(value = "limit", required = false) String limit,
-			@RequestParam(value = "sort", required = false) String sort) {
-		// TODO Auto-generated constructor stub
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret = AreaController.ytiotTAreaService.getCity(queryJson,page,start,limit,sort);
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/getCity", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView getCity(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                @RequestParam(value = "page", required = false) String page,
+                                @RequestParam(value = "start", required = false) String start,
+                                @RequestParam(value = "limit", required = false) String limit,
+                                @RequestParam(value = "sort", required = false) String sort,
+                                HttpServletRequest request) {
+        // TODO Auto-generated constructor stub
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            JSONObject json = new JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        JSONObject jsonObject = JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = AreaController.ytiotTAreaService.getCity(jsonObject.toString(), page, start, limit, sort);
 //			System.out.println(ret);
-			mav.addObject("ret_str", ret);
-			
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-	@RequestMapping(value="/getQu",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView  getQu(@RequestParam(value = "queryJson", required = false) String queryJson,
-			@RequestParam(value = "page", required = false) String page,
-			@RequestParam(value = "start", required = false) String start,
-			@RequestParam(value = "limit", required = false) String limit,
-			@RequestParam(value = "sort", required = false) String sort) {
-		// TODO Auto-generated constructor stub
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret = AreaController.ytiotTAreaService.getQu(queryJson,page,start,limit,sort);
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/getQu", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView getQu(@RequestParam(value = "queryJson", required = false) String queryJson,
+                              @RequestParam(value = "page", required = false) String page,
+                              @RequestParam(value = "start", required = false) String start,
+                              @RequestParam(value = "limit", required = false) String limit,
+                              @RequestParam(value = "sort", required = false) String sort,
+                              HttpServletRequest request) {
+        // TODO Auto-generated constructor stub
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            JSONObject json = new JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        JSONObject jsonObject = JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = AreaController.ytiotTAreaService.getQu(jsonObject.toString(), page, start, limit, sort);
 //			System.out.println(ret);
-			mav.addObject("ret_str", ret);
-			
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-	@RequestMapping(value="/getverList",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView  getverList(@RequestParam(value = "queryJson", required = false) String queryJson,
-			@RequestParam(value = "page", required = false) String page,
-			@RequestParam(value = "start", required = false) String start,
-			@RequestParam(value = "limit", required = false) String limit,
-			@RequestParam(value = "sort", required = false) String sort) {
-		// TODO Auto-generated constructor stub
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-		//System.out.println(queryJson);
-		try {
-			String ret = AreaController.ytiotTAreaService.getAreaverList(queryJson,page,start,limit,sort);
-			//System.out.println(ret);
-			mav.addObject("ret_str", ret);
-			
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	@RequestMapping(value="/append",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView append(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-		//System.out.println(queryJson);
-		try {
-			String ret = AreaController.ytiotTAreaService.appendArea(queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	@RequestMapping(value="/update",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView update(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-		//System.out.println(queryJson);
-		try {
-			String ret = AreaController.ytiotTAreaService.updateArea(queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	@RequestMapping(value="/delete",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView delete(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-		//System.out.println(queryJson);
-		try {
-			String ret = AreaController.ytiotTAreaService.deleteArea(queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/getverList", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView getverList(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                   @RequestParam(value = "page", required = false) String page,
+                                   @RequestParam(value = "start", required = false) String start,
+                                   @RequestParam(value = "limit", required = false) String limit,
+                                   @RequestParam(value = "sort", required = false) String sort,
+                                   HttpServletRequest request) {
+        // TODO Auto-generated constructor stub
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            JSONObject json = new JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        JSONObject jsonObject = JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = AreaController.ytiotTAreaService.getAreaverList(jsonObject.toString(), page, start, limit, sort);
+            //System.out.println(ret);
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/append", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView append(@RequestParam(value = "queryJson", required = false) String queryJson,
+                               HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            JSONObject json = new JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        JSONObject jsonObject = JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = AreaController.ytiotTAreaService.appendArea(jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/update", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView update(@RequestParam(value = "queryJson", required = false) String queryJson,
+                               HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            JSONObject json = new JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        JSONObject jsonObject = JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = AreaController.ytiotTAreaService.updateArea(jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/delete", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView delete(@RequestParam(value = "queryJson", required = false) String queryJson,
+                               HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            JSONObject json = new JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        JSONObject jsonObject = JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = AreaController.ytiotTAreaService.deleteArea(jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
 }

src/cn/com/usky/iot/controller/BuildingController.java

@@ -2,7 +2,15 @@ package cn.com.usky.iot.controller;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 
+import cn.com.usky.iot.auth.TokenAuthBO;
+import cn.com.usky.iot.auth.TokenAuthService;
+import cn.com.usky.iot.controller.login.Constants;
+import cn.com.usky.iot.entity.YtiotTAdmin;
+import cn.com.usky.utils.HttpServletRequestUtils;
+import com.alibaba.fastjson.JSONObject;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -10,90 +18,148 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.servlet.ModelAndView;
 
 import cn.com.usky.iot.building.service.YtiotTBuildingService;
+
 @Controller
 @RequestMapping("/iot/building")
 public class BuildingController {
-	@Resource
-	private YtiotTBuildingService ytiotTBuildingService;
-	
-	private static BuildingController BuildingController;
-	
-	
-	 @PostConstruct
-	 public void init() {
-		 BuildingController = this;
-		 BuildingController.ytiotTBuildingService = this.ytiotTBuildingService;
-	 }
-
-	@RequestMapping(value="/getList",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView  getList(@RequestParam(value = "queryJson", required = false) String queryJson,
-			@RequestParam(value = "page", required = false) String page,
-			@RequestParam(value = "start", required = false) String start,
-			@RequestParam(value = "limit", required = false) String limit,
-			@RequestParam(value = "sort", required = false) String sort) {
-		// TODO Auto-generated constructor stub
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret = BuildingController.ytiotTBuildingService.getBuildingList(queryJson,page,start,limit,sort);
+    @Resource
+    private YtiotTBuildingService ytiotTBuildingService;
+
+    private static BuildingController BuildingController;
+
+
+    @PostConstruct
+    public void init() {
+        BuildingController = this;
+        BuildingController.ytiotTBuildingService = this.ytiotTBuildingService;
+    }
+
+    @Autowired
+    private TokenAuthService tokenAuthService;
+
+    @RequestMapping(value = "/getList", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView getList(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                @RequestParam(value = "page", required = false) String page,
+                                @RequestParam(value = "start", required = false) String start,
+                                @RequestParam(value = "limit", required = false) String limit,
+                                @RequestParam(value = "sort", required = false) String sort,
+                                HttpServletRequest request) {
+        // TODO Auto-generated constructor stub
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            JSONObject json = new JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        JSONObject jsonObject = JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = BuildingController.ytiotTBuildingService.getBuildingList(jsonObject.toString(), page, start, limit, sort);
 //			System.out.println(ret);
-			mav.addObject("ret_str", ret);
-			
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-	
-	@RequestMapping(value="/getverList",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView  getverList(@RequestParam(value = "queryJson", required = false) String queryJson,
-			@RequestParam(value = "page", required = false) String page,
-			@RequestParam(value = "start", required = false) String start,
-			@RequestParam(value = "limit", required = false) String limit,
-			@RequestParam(value = "sort", required = false) String sort) {
-		// TODO Auto-generated constructor stub
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-		//System.out.println(queryJson);
-		try {
-			String ret = BuildingController.ytiotTBuildingService.getBuildingverList(queryJson,page,start,limit,sort);
-			//System.out.println(ret);
-			mav.addObject("ret_str", ret);
-			
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	@RequestMapping(value="/append",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView append(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-		//System.out.println(queryJson);
-		try {
-			String ret = BuildingController.ytiotTBuildingService.appendBuilding(queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	@RequestMapping(value="/update",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView update(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-		//System.out.println(queryJson);
-		try {
-			String ret = BuildingController.ytiotTBuildingService.updateBuilding(queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+
+    @RequestMapping(value = "/getverList", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView getverList(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                   @RequestParam(value = "page", required = false) String page,
+                                   @RequestParam(value = "start", required = false) String start,
+                                   @RequestParam(value = "limit", required = false) String limit,
+                                   @RequestParam(value = "sort", required = false) String sort,
+                                   HttpServletRequest request) {
+        // TODO Auto-generated constructor stub
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            JSONObject json = new JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        JSONObject jsonObject = JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = BuildingController.ytiotTBuildingService.getBuildingverList(jsonObject.toString(), page, start, limit, sort);
+            //System.out.println(ret);
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/append", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView append(@RequestParam(value = "queryJson", required = false) String queryJson,
+                               HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            JSONObject json = new JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        JSONObject jsonObject = JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = BuildingController.ytiotTBuildingService.appendBuilding(jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/update", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView update(@RequestParam(value = "queryJson", required = false) String queryJson,
+                               HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            JSONObject json = new JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        JSONObject jsonObject = JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = BuildingController.ytiotTBuildingService.updateBuilding(jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
 }

src/cn/com/usky/iot/controller/CheckRecord2Controller.java

@@ -2,7 +2,15 @@ package cn.com.usky.iot.controller;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 
+import cn.com.usky.iot.auth.TokenAuthBO;
+import cn.com.usky.iot.auth.TokenAuthService;
+import cn.com.usky.iot.controller.login.Constants;
+import cn.com.usky.iot.entity.YtiotTAdmin;
+import cn.com.usky.utils.HttpServletRequestUtils;
+import com.alibaba.fastjson.JSONObject;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -15,39 +23,55 @@ import cn.com.usky.iot.maintenanceplan.service.YtiotTMaintenancePlanService;
 @RequestMapping("/iot/checkrecord2")
 public class CheckRecord2Controller {
 
-	@Resource
-	private YtiotTMaintenancePlanService ytiotTMaintenancePlanService;
-	
-	private static CheckRecord2Controller checkrecord2Controller;
-	
-	
-	 @PostConstruct
-	 public void init() {
-		 checkrecord2Controller = this;
-		 checkrecord2Controller.ytiotTMaintenancePlanService = this.ytiotTMaintenancePlanService;
-	 }
-
-	@RequestMapping(value="/getList",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView  getList(@RequestParam(value = "queryJson", required = false) String queryJson,
-			@RequestParam(value = "page", required = false) String page,
-			@RequestParam(value = "start", required = false) String start,
-			@RequestParam(value = "limit", required = false) String limit,
-			@RequestParam(value = "sort", required = false) String sort) {
-		// TODO Auto-generated constructor stub
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  checkrecord2Controller.ytiotTMaintenancePlanService.getCheckRecord2List(queryJson,page,start,limit,sort);
+    @Resource
+    private YtiotTMaintenancePlanService ytiotTMaintenancePlanService;
+
+    private static CheckRecord2Controller checkrecord2Controller;
+
+
+    @PostConstruct
+    public void init() {
+        checkrecord2Controller = this;
+        checkrecord2Controller.ytiotTMaintenancePlanService = this.ytiotTMaintenancePlanService;
+    }
+
+    @Autowired
+    private TokenAuthService tokenAuthService;
+
+    @RequestMapping(value = "/getList", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView getList(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                @RequestParam(value = "page", required = false) String page,
+                                @RequestParam(value = "start", required = false) String start,
+                                @RequestParam(value = "limit", required = false) String limit,
+                                @RequestParam(value = "sort", required = false) String sort,
+                                HttpServletRequest request) {
+        // TODO Auto-generated constructor stub
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            JSONObject json = new JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        JSONObject jsonObject = JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = checkrecord2Controller.ytiotTMaintenancePlanService.getCheckRecord2List(jsonObject.toString(), page, start, limit, sort);
 //			System.out.println(ret);
-			mav.addObject("ret_str", ret);
-			
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
 
 
 }

src/cn/com/usky/iot/controller/CheckRecordController.java

@@ -2,7 +2,15 @@ package cn.com.usky.iot.controller;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 
+import cn.com.usky.iot.auth.TokenAuthBO;
+import cn.com.usky.iot.auth.TokenAuthService;
+import cn.com.usky.iot.controller.login.Constants;
+import cn.com.usky.iot.entity.YtiotTAdmin;
+import cn.com.usky.utils.HttpServletRequestUtils;
+import com.alibaba.fastjson.JSONObject;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -15,39 +23,55 @@ import cn.com.usky.iot.patrolplan.service.YtiotTPatrolPlanService;
 @RequestMapping("/iot/checkrecord")
 public class CheckRecordController {
 
-	@Resource
-	private YtiotTPatrolPlanService ytiotTPatrolPlanService;
-	
-	private static CheckRecordController checkrecordController;
-	
-	
-	 @PostConstruct
-	 public void init() {
-		 checkrecordController = this;
-		 checkrecordController.ytiotTPatrolPlanService = this.ytiotTPatrolPlanService;
-	 }
-
-	@RequestMapping(value="/getList",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView  getList(@RequestParam(value = "queryJson", required = false) String queryJson,
-			@RequestParam(value = "page", required = false) String page,
-			@RequestParam(value = "start", required = false) String start,
-			@RequestParam(value = "limit", required = false) String limit,
-			@RequestParam(value = "sort", required = false) String sort) {
-		// TODO Auto-generated constructor stub
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  checkrecordController.ytiotTPatrolPlanService.getCheckRecordList(queryJson,page,start,limit,sort);
+    @Resource
+    private YtiotTPatrolPlanService ytiotTPatrolPlanService;
+
+    private static CheckRecordController checkrecordController;
+
+
+    @PostConstruct
+    public void init() {
+        checkrecordController = this;
+        checkrecordController.ytiotTPatrolPlanService = this.ytiotTPatrolPlanService;
+    }
+
+    @Autowired
+    private TokenAuthService tokenAuthService;
+
+    @RequestMapping(value = "/getList", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView getList(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                @RequestParam(value = "page", required = false) String page,
+                                @RequestParam(value = "start", required = false) String start,
+                                @RequestParam(value = "limit", required = false) String limit,
+                                @RequestParam(value = "sort", required = false) String sort,
+                                HttpServletRequest request) {
+        // TODO Auto-generated constructor stub
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            JSONObject json = new JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        JSONObject jsonObject = JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = checkrecordController.ytiotTPatrolPlanService.getCheckRecordList(jsonObject.toString(), page, start, limit, sort);
 //			System.out.println(ret);
-			mav.addObject("ret_str", ret);
-			
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
 
 
 }

src/cn/com/usky/iot/controller/CompanyController.java

@@ -2,7 +2,15 @@ package cn.com.usky.iot.controller;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 
+import cn.com.usky.iot.auth.TokenAuthBO;
+import cn.com.usky.iot.auth.TokenAuthService;
+import cn.com.usky.iot.controller.login.Constants;
+import cn.com.usky.iot.entity.YtiotTAdmin;
+import cn.com.usky.utils.HttpServletRequestUtils;
+import com.alibaba.fastjson.JSONObject;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -15,99 +23,171 @@ import cn.com.usky.iot.company.service.YtiotTCompanyService;
 @RequestMapping("/iot/company")
 public class CompanyController {
 
-	@Resource
-	private YtiotTCompanyService ytiotTCompanyService;
-	
-	private static CompanyController companyController;
-	
-	
-	 @PostConstruct
-	 public void init() {
-		 companyController = this;
-		 companyController.ytiotTCompanyService = this.ytiotTCompanyService;
-	 }
-
-	@RequestMapping(value="/getList",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView  getList(@RequestParam(value = "queryJson", required = false) String queryJson,
-			@RequestParam(value = "page", required = false) String page,
-			@RequestParam(value = "start", required = false) String start,
-			@RequestParam(value = "limit", required = false) String limit,
-			@RequestParam(value = "sort", required = false) String sort) {
-		// TODO Auto-generated constructor stub
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret = companyController.ytiotTCompanyService.getCompanyList(queryJson,page,start,limit,sort);
+    @Resource
+    private YtiotTCompanyService ytiotTCompanyService;
+
+    private static CompanyController companyController;
+
+
+    @PostConstruct
+    public void init() {
+        companyController = this;
+        companyController.ytiotTCompanyService = this.ytiotTCompanyService;
+    }
+
+    @Autowired
+    private TokenAuthService tokenAuthService;
+
+    @RequestMapping(value = "/getList", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView getList(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                @RequestParam(value = "page", required = false) String page,
+                                @RequestParam(value = "start", required = false) String start,
+                                @RequestParam(value = "limit", required = false) String limit,
+                                @RequestParam(value = "sort", required = false) String sort,
+                                HttpServletRequest request) {
+        // TODO Auto-generated constructor stub
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            JSONObject json = new JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        JSONObject jsonObject = JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = companyController.ytiotTCompanyService.getCompanyList(jsonObject.toString(), page, start, limit, sort);
 //			System.out.println(ret);
-			mav.addObject("ret_str", ret);
-			
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	@RequestMapping(value="/getVerList",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView  getVerList(@RequestParam(value = "queryJson", required = false) String queryJson,
-			@RequestParam(value = "page", required = false) String page,
-			@RequestParam(value = "start", required = false) String start,
-			@RequestParam(value = "limit", required = false) String limit,
-			@RequestParam(value = "sort", required = false) String sort) {
-		// TODO Auto-generated constructor stub
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret = companyController.ytiotTCompanyService.getCompanyVerList(queryJson,page,start,limit,sort);
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/getVerList", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView getVerList(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                   @RequestParam(value = "page", required = false) String page,
+                                   @RequestParam(value = "start", required = false) String start,
+                                   @RequestParam(value = "limit", required = false) String limit,
+                                   @RequestParam(value = "sort", required = false) String sort,
+                                   HttpServletRequest request) {
+        // TODO Auto-generated constructor stub
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            JSONObject json = new JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        JSONObject jsonObject = JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = companyController.ytiotTCompanyService.getCompanyVerList(jsonObject.toString(), page, start, limit, sort);
 //			System.out.println(ret);
-			mav.addObject("ret_str", ret);
-			
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	@RequestMapping(value="/append",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView append(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret = companyController.ytiotTCompanyService.appendCompany(queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	@RequestMapping(value="/update",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView update(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret = companyController.ytiotTCompanyService.updateCompany(queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	//注销
-	@RequestMapping(value="/del",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView del(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret = companyController.ytiotTCompanyService.deleteCompany(queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/append", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView append(@RequestParam(value = "queryJson", required = false) String queryJson,
+                               HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            JSONObject json = new JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        JSONObject jsonObject = JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = companyController.ytiotTCompanyService.appendCompany(jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/update", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView update(@RequestParam(value = "queryJson", required = false) String queryJson,
+                               HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            JSONObject json = new JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        JSONObject jsonObject = JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = companyController.ytiotTCompanyService.updateCompany(jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    //注销
+    @RequestMapping(value = "/del", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView del(@RequestParam(value = "queryJson", required = false) String queryJson,
+                            HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            JSONObject json = new JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        JSONObject jsonObject = JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = companyController.ytiotTCompanyService.deleteCompany(jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
 
 }

src/cn/com/usky/iot/controller/CompanyViewController.java

@@ -2,8 +2,15 @@ package cn.com.usky.iot.controller;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 
+import cn.com.usky.iot.auth.TokenAuthBO;
+import cn.com.usky.iot.auth.TokenAuthService;
+import cn.com.usky.iot.controller.login.Constants;
+import cn.com.usky.iot.entity.YtiotTAdmin;
+import cn.com.usky.utils.HttpServletRequestUtils;
 import net.sf.json.JSONObject;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -15,88 +22,128 @@ import cn.com.usky.iot.company.service.YtiotVCompanyService;
 @Controller
 @RequestMapping("/iot/company/view")
 public class CompanyViewController {
-	
-	@Resource
-	private YtiotVCompanyService ytiotVCompanyService;
-	private static CompanyViewController companyViewController;
-	
-	@PostConstruct
-	 public void init() {
-		companyViewController = this;
-		companyViewController.ytiotVCompanyService = this.ytiotVCompanyService;
-	}
-	
-	@RequestMapping(value="/getList",method= {RequestMethod.GET,RequestMethod.POST})
-	public static ModelAndView  getList(@RequestParam(value = "queryJson", required = false) String queryJson,
-			@RequestParam(value = "page", required = false) String page,
-			@RequestParam(value = "start", required = false) String start,
-			@RequestParam(value = "limit", required = false) String limit,
-			@RequestParam(value = "sort", required = false) String sort) {
-		// TODO Auto-generated constructor stub
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
+
+    @Resource
+    private YtiotVCompanyService ytiotVCompanyService;
+    private static CompanyViewController companyViewController;
+
+    @PostConstruct
+    public void init() {
+        companyViewController = this;
+        companyViewController.ytiotVCompanyService = this.ytiotVCompanyService;
+    }
+
+    @Autowired
+    private TokenAuthService tokenAuthService;
+
+    @RequestMapping(value = "/getList", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView getList(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                @RequestParam(value = "page", required = false) String page,
+                                @RequestParam(value = "start", required = false) String start,
+                                @RequestParam(value = "limit", required = false) String limit,
+                                @RequestParam(value = "sort", required = false) String sort,
+                                HttpServletRequest request) {
+        // TODO Auto-generated constructor stub
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
 //			System.out.println(queryJson);
-			if(companyViewController.ytiotVCompanyService==null)
-			{
-				System.out.println("Service is NULL");
-			}
-			String ret = companyViewController.ytiotVCompanyService.getVCompanyList(queryJson,page,start,limit,sort);
+            if (companyViewController.ytiotVCompanyService == null) {
+                System.out.println("Service is NULL");
+            }
+            String ret = companyViewController.ytiotVCompanyService.getVCompanyList(jsonObject.toString(), page, start, limit, sort);
 //			System.out.println(ret);
-			mav.addObject("ret_str", ret);
-			
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	@RequestMapping(value="/getNameList",method= {RequestMethod.GET,RequestMethod.POST})
-	public static ModelAndView  getNameList(@RequestParam(value = "queryJson", required = false) String queryJson,
-											@RequestParam(value = "page", required = false) String page,
-											@RequestParam(value = "start", required = false) String start,
-											@RequestParam(value = "limit", required = false) String limit,
-											@RequestParam(value = "sort", required = false) String sort) {
-		// TODO Auto-generated constructor stub
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/getNameList", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView getNameList(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                    @RequestParam(value = "page", required = false) String page,
+                                    @RequestParam(value = "start", required = false) String start,
+                                    @RequestParam(value = "limit", required = false) String limit,
+                                    @RequestParam(value = "sort", required = false) String sort,
+                                    HttpServletRequest request) {
+        // TODO Auto-generated constructor stub
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
 //			System.out.println(queryJson);
-			if(companyViewController.ytiotVCompanyService==null)
-			{
-				System.out.println("Service is NULL");
-			}
-			String ret = companyViewController.ytiotVCompanyService.getVCompanyNameList(queryJson);
+            if (companyViewController.ytiotVCompanyService == null) {
+                System.out.println("Service is NULL");
+            }
+            String ret = companyViewController.ytiotVCompanyService.getVCompanyNameList(jsonObject.toString());
 //			System.out.println(ret);
-			mav.addObject("ret_str", ret);
-
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
-
-
-    @RequestMapping(value="/getTimeList",method= {RequestMethod.GET,RequestMethod.POST})
-    public static ModelAndView  getTimeList(@RequestParam(value = "build_code", required = false) String queryJson,
-                                            @RequestParam(value = "page", required = false) String page,
-                                            @RequestParam(value = "start", required = false) String start,
-                                            @RequestParam(value = "limit", required = false) String limit,
-                                            @RequestParam(value = "sort", required = false) String sort) {
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+
+    @RequestMapping(value = "/getTimeList", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView getTimeList(@RequestParam(value = "build_code", required = false) String queryJson,
+                                    @RequestParam(value = "page", required = false) String page,
+                                    @RequestParam(value = "start", required = false) String start,
+                                    @RequestParam(value = "limit", required = false) String limit,
+                                    @RequestParam(value = "sort", required = false) String sort,
+                                    HttpServletRequest request) {
         // TODO Auto-generated constructor stub
         ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
         mav.setViewName("return");
-//		System.out.println(queryJson);
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
         try {
 //			System.out.println(queryJson);
-            if(companyViewController.ytiotVCompanyService==null)
-            {
+            if (companyViewController.ytiotVCompanyService == null) {
                 System.out.println("Service is NULL");
             }
-            String ret = companyViewController.ytiotVCompanyService.getTimeList(queryJson);
+            String ret = companyViewController.ytiotVCompanyService.getTimeList(jsonObject.toString());
 //			System.out.println(ret);
             mav.addObject("ret_str", ret);
 
@@ -108,144 +155,201 @@ public class CompanyViewController {
     }
 
     //年报
-	@RequestMapping(value="/getYearTimeList",method= {RequestMethod.GET,RequestMethod.POST})
-	public static ModelAndView  getYearTimeList(@RequestParam(value = "build_code", required = false) String queryJson,
-											@RequestParam(value = "page", required = false) String page,
-											@RequestParam(value = "start", required = false) String start,
-											@RequestParam(value = "limit", required = false) String limit,
-											@RequestParam(value = "sort", required = false) String sort) {
-		// TODO Auto-generated constructor stub
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
+    @RequestMapping(value = "/getYearTimeList", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView getYearTimeList(@RequestParam(value = "build_code", required = false) String queryJson,
+                                        @RequestParam(value = "page", required = false) String page,
+                                        @RequestParam(value = "start", required = false) String start,
+                                        @RequestParam(value = "limit", required = false) String limit,
+                                        @RequestParam(value = "sort", required = false) String sort,
+                                        HttpServletRequest request) {
+        // TODO Auto-generated constructor stub
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
 //			System.out.println(queryJson);
-			if(companyViewController.ytiotVCompanyService==null)
-			{
-				System.out.println("Service is NULL");
-			}
-			String ret = companyViewController.ytiotVCompanyService.getYearTimeList(queryJson);
+            if (companyViewController.ytiotVCompanyService == null) {
+                System.out.println("Service is NULL");
+            }
+            String ret = companyViewController.ytiotVCompanyService.getYearTimeList(jsonObject.toString());
 //			System.out.println(ret);
-			mav.addObject("ret_str", ret);
-
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
-
-	@RequestMapping(value="/getBuildingNameList",method= {RequestMethod.GET,RequestMethod.POST})
-	public static ModelAndView  getNameList(@RequestParam(value = "queryJson", required = false) String queryJson
-			) {
-		// TODO Auto-generated constructor stub
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/getBuildingNameList", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView getNameList(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                    HttpServletRequest request
+    ) {
+        // TODO Auto-generated constructor stub
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
 //			System.out.println(queryJson);
-			if(companyViewController.ytiotVCompanyService==null)
-			{
-				System.out.println("Service is NULL");
-			}
-			String ret = companyViewController.ytiotVCompanyService.getVBuildingNameList(queryJson);
+            if (companyViewController.ytiotVCompanyService == null) {
+                System.out.println("Service is NULL");
+            }
+            String ret = companyViewController.ytiotVCompanyService.getVBuildingNameList(jsonObject.toString());
 //			System.out.println(ret);
-			mav.addObject("ret_str", ret);
-			
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-	@RequestMapping(value="/getProjectList",method= {RequestMethod.GET,RequestMethod.POST})
-	public static ModelAndView  getProjectList(@RequestParam(value = "queryJson", required = false) String queryJson,
-			@RequestParam(value = "page", required = false) String page,
-			@RequestParam(value = "start", required = false) String start,
-			@RequestParam(value = "limit", required = false) String limit,
-			@RequestParam(value = "sort", required = false) String sort) {
-		// TODO Auto-generated constructor stub
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/getProjectList", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView getProjectList(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                       @RequestParam(value = "page", required = false) String page,
+                                       @RequestParam(value = "start", required = false) String start,
+                                       @RequestParam(value = "limit", required = false) String limit,
+                                       @RequestParam(value = "sort", required = false) String sort,
+                                       HttpServletRequest request) {
+        // TODO Auto-generated constructor stub
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
 //			System.out.println(queryJson);
-			if(companyViewController.ytiotVCompanyService==null)
-			{
-				System.out.println("Service is NULL");
-			}
-			String ret = companyViewController.ytiotVCompanyService.getVProjectNameList(queryJson);
+            if (companyViewController.ytiotVCompanyService == null) {
+                System.out.println("Service is NULL");
+            }
+            String ret = companyViewController.ytiotVCompanyService.getVProjectNameList(jsonObject.toString());
 //			System.out.println(ret);
-			mav.addObject("ret_str", ret);
-			
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
-
-
-
-	@RequestMapping(value="/getMonthReport",method= {RequestMethod.GET,RequestMethod.POST})
-	public static ModelAndView  getMonthReport(@RequestParam(value = "queryJson", required = false) String queryJson,
-											  // @RequestParam(value = "month", required = false) String month,
-											  // @RequestParam(value = "build_code", required = false) String buildCode,
-											   @RequestParam(value = "limit", required = false) String limit,
-											   @RequestParam(value = "sort", required = false) String sort) {
-		// TODO Auto-generated constructor stub
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+
+    @RequestMapping(value = "/getMonthReport", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView getMonthReport(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                       // @RequestParam(value = "month", required = false) String month,
+                                       // @RequestParam(value = "build_code", required = false) String buildCode,
+                                       @RequestParam(value = "limit", required = false) String limit,
+                                       @RequestParam(value = "sort", required = false) String sort) {
+        // TODO Auto-generated constructor stub
+        ModelAndView mav = new ModelAndView();
+//        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+//        boolean isAuth = tokenAuthBO.isAuthState();
+//        if (!isAuth) {
+//            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+//            json.put("check", false);
+//            json.put("errMsg", "权限错误，请重新登录");
+//            mav.addObject("ret_str", json.toJSONString());
+//        }
+        mav.setViewName("return");
+//        //通过获取用户信息
+//        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+//        com.alibaba.fastjson.JSONObject jsonObject1 = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+//        jsonObject1.put("V_LOGINNAME", o.getVLoginname());
+//        jsonObject1.put("V_PASSWORD", o.getVPassword());
+        try {
 //			System.out.println(queryJson);
-			if(companyViewController.ytiotVCompanyService==null)
-			{
-				System.out.println("Service is NULL");
-			}
-			JSONObject jsonObject = JSONObject.fromObject(queryJson);
-			String buildCode = jsonObject.getString("build_code");
-			String month = jsonObject.getString("month");
-			String ret = companyViewController.ytiotVCompanyService.getMonthReport(buildCode,month);
+            if (companyViewController.ytiotVCompanyService == null) {
+                System.out.println("Service is NULL");
+            }
+            JSONObject jsonObject = JSONObject.fromObject(queryJson);
+            String buildCode = jsonObject.getString("build_code");
+            String month = jsonObject.getString("month");
+            String ret = companyViewController.ytiotVCompanyService.getMonthReport(buildCode, month);
 //			System.out.println(ret);
-			mav.addObject("ret_str", ret);
-
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
-
-
-	@RequestMapping(value="/getYearReport",method= {RequestMethod.GET,RequestMethod.POST})
-	public static ModelAndView  getYearReport(@RequestParam(value = "queryJson", required = false) String queryJson,
-											   // @RequestParam(value = "month", required = false) String month,
-											   // @RequestParam(value = "build_code", required = false) String buildCode,
-											   @RequestParam(value = "limit", required = false) String limit,
-											   @RequestParam(value = "sort", required = false) String sort) {
-		// TODO Auto-generated constructor stub
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+
+    @RequestMapping(value = "/getYearReport", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView getYearReport(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                      // @RequestParam(value = "month", required = false) String month,
+                                      // @RequestParam(value = "build_code", required = false) String buildCode,
+                                      @RequestParam(value = "limit", required = false) String limit,
+                                      @RequestParam(value = "sort", required = false) String sort) {
+        // TODO Auto-generated constructor stub
+        ModelAndView mav = new ModelAndView();
+//        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+//        boolean isAuth = tokenAuthBO.isAuthState();
+//        if (!isAuth) {
+//            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+//            json.put("check", false);
+//            json.put("errMsg", "权限错误，请重新登录");
+//            mav.addObject("ret_str", json.toJSONString());
+//        }
+        mav.setViewName("return");
+//        //通过获取用户信息
+//        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+//        com.alibaba.fastjson.JSONObject jsonObject1 = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+//        jsonObject1.put("V_LOGINNAME", o.getVLoginname());
+//        jsonObject1.put("V_PASSWORD", o.getVPassword());
+        try {
 //			System.out.println(queryJson);
-			if(companyViewController.ytiotVCompanyService==null)
-			{
-				System.out.println("Service is NULL");
-			}
-			JSONObject jsonObject = JSONObject.fromObject(queryJson);
-			String buildCode = jsonObject.getString("build_code");
-			String month = jsonObject.getString("month");
-			String ret = companyViewController.ytiotVCompanyService.getYearReport(buildCode,month);
+            if (companyViewController.ytiotVCompanyService == null) {
+                System.out.println("Service is NULL");
+            }
+            JSONObject jsonObject = JSONObject.fromObject(queryJson);
+            String buildCode = jsonObject.getString("build_code");
+            String month = jsonObject.getString("month");
+            String ret = companyViewController.ytiotVCompanyService.getYearReport(buildCode, month);
 //			System.out.println(ret);
-			mav.addObject("ret_str", ret);
-
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
 }

src/cn/com/usky/iot/controller/DataViewController.java

@@ -2,7 +2,14 @@ package cn.com.usky.iot.controller;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 
+import cn.com.usky.iot.auth.TokenAuthBO;
+import cn.com.usky.iot.auth.TokenAuthService;
+import cn.com.usky.iot.controller.login.Constants;
+import cn.com.usky.iot.entity.YtiotTAdmin;
+import cn.com.usky.utils.HttpServletRequestUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -15,179 +22,304 @@ import cn.com.usky.iot.data.service.YtiotVDataService;
 @RequestMapping("/iot/data/view")
 public class DataViewController {
 
-	@Resource
-	private YtiotVDataService ytiotVDataService;
-	private static DataViewController dataViewController;
-	
-	@PostConstruct
-	 public void init() {
-		dataViewController = this;
-		dataViewController.ytiotVDataService = this.ytiotVDataService;
-	}
-	
-	@RequestMapping(value="/getSyncPointVList",method= {RequestMethod.GET,RequestMethod.POST})
-	public static ModelAndView  getSyncPointVList(@RequestParam(value = "queryJson", required = false) String queryJson,
-			@RequestParam(value = "page", required = false) String page,
-			@RequestParam(value = "start", required = false) String start,
-			@RequestParam(value = "limit", required = false) String limit,
-			@RequestParam(value = "sort", required = false) String sort) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-		try {
-			String ret = dataViewController.ytiotVDataService.getSyncPointVList(queryJson, page, start, limit, sort);
-			mav.addObject("ret_str", ret);
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-	@RequestMapping(value="/getSyncDataVList",method= {RequestMethod.GET,RequestMethod.POST})
-	public static ModelAndView  getSyncDataVList(@RequestParam(value = "queryJson", required = false) String queryJson,
-			@RequestParam(value = "page", required = false) String page,
-			@RequestParam(value = "start", required = false) String start,
-			@RequestParam(value = "limit", required = false) String limit,
-			@RequestParam(value = "sort", required = false) String sort) {
-		
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-		try {
-			String ret = dataViewController.ytiotVDataService.getSyncDataVList(queryJson, page, start, limit, sort);
-			mav.addObject("ret_str", ret);
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	@RequestMapping(value="/getSyncDataQList",method= {RequestMethod.GET,RequestMethod.POST})
-	public static ModelAndView  getSyncDataQList(@RequestParam(value = "queryJson", required = false) String queryJson,
-			@RequestParam(value = "page", required = false) String page,
-			@RequestParam(value = "start", required = false) String start,
-			@RequestParam(value = "limit", required = false) String limit,
-			@RequestParam(value = "sort", required = false) String sort) {
-		//System.out.println("hello world!");
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-		try {
-			String ret = dataViewController.ytiotVDataService.getSyncDataQList(queryJson, page, start, limit, sort);
-			mav.addObject("ret_str", ret);
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	@RequestMapping(value="/getSyncwaterDataVList",method= {RequestMethod.GET,RequestMethod.POST})
-	public static ModelAndView  getSyncwaterDataVList(@RequestParam(value = "queryJson", required = false) String queryJson,
-			@RequestParam(value = "page", required = false) String page,
-			@RequestParam(value = "start", required = false) String start,
-			@RequestParam(value = "limit", required = false) String limit,
-			@RequestParam(value = "sort", required = false) String sort) {
-//		System.out.println("hello world!");
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-		try {
-			String ret = dataViewController.ytiotVDataService.getSyncwaterDataVList(queryJson, page, start, limit, sort);
-			mav.addObject("ret_str", ret);
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-	@RequestMapping(value="/getSyncDataRList",method= {RequestMethod.GET,RequestMethod.POST})
-	public static ModelAndView  getSyncDataRList(@RequestParam(value = "queryJson", required = false) String queryJson,
-			@RequestParam(value = "page", required = false) String page,
-			@RequestParam(value = "start", required = false) String start,
-			@RequestParam(value = "limit", required = false) String limit,
-			@RequestParam(value = "sort", required = false) String sort) {
-		//System.out.println("hello world!");
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-		try {
-			String ret = dataViewController.ytiotVDataService.getSyncDataRList(queryJson, page, start, limit, sort);
-			mav.addObject("ret_str", ret);
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-	@RequestMapping(value="/getSyncrtuDataVList",method= {RequestMethod.GET,RequestMethod.POST})
-	public static ModelAndView  getSyncrtuDataVList(@RequestParam(value = "queryJson", required = false) String queryJson,
-			@RequestParam(value = "page", required = false) String page,
-			@RequestParam(value = "start", required = false) String start,
-			@RequestParam(value = "limit", required = false) String limit,
-			@RequestParam(value = "sort", required = false) String sort) {
-//		System.out.println("hello world!");
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-		try {
-			String ret = dataViewController.ytiotVDataService.getSyncrtuDataVList(queryJson, page, start, limit, sort);
-			mav.addObject("ret_str", ret);
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-	@RequestMapping(value="/getSyncDataFList",method= {RequestMethod.GET,RequestMethod.POST})
-	public static ModelAndView  getSyncDataFList(@RequestParam(value = "queryJson", required = false) String queryJson,
-			@RequestParam(value = "page", required = false) String page,
-			@RequestParam(value = "start", required = false) String start,
-			@RequestParam(value = "limit", required = false) String limit,
-			@RequestParam(value = "sort", required = false) String sort) {
-		//System.out.println("hello world!");
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-		try {
-			String ret = dataViewController.ytiotVDataService.getSyncDataFList(queryJson, page, start, limit, sort);
-			mav.addObject("ret_str", ret);
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-	@RequestMapping(value="/getSyncfireDataVList",method= {RequestMethod.GET,RequestMethod.POST})
-	public static ModelAndView  getSyncfireDataVList(@RequestParam(value = "queryJson", required = false) String queryJson,
-			@RequestParam(value = "page", required = false) String page,
-			@RequestParam(value = "start", required = false) String start,
-			@RequestParam(value = "limit", required = false) String limit,
-			@RequestParam(value = "sort", required = false) String sort) {
-//		System.out.println("hello world!");
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-		try {
-			String ret = dataViewController.ytiotVDataService.getSyncfireDataVList(queryJson, page, start, limit, sort);
-			mav.addObject("ret_str", ret);
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-	@RequestMapping(value="/getSyncDataVListByCompany",method= {RequestMethod.GET,RequestMethod.POST})
-	public static ModelAndView  getSyncDataVListByCompany(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-		try {
-			String ret = dataViewController.ytiotVDataService.getSyncDataVListByCompany(queryJson);
-			mav.addObject("ret_str", ret);
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
+    @Resource
+    private YtiotVDataService ytiotVDataService;
+    private static DataViewController dataViewController;
+
+    @PostConstruct
+    public void init() {
+        dataViewController = this;
+        dataViewController.ytiotVDataService = this.ytiotVDataService;
+    }
+
+    @Autowired
+    private TokenAuthService tokenAuthService;
+
+    @RequestMapping(value = "/getSyncPointVList", method = {RequestMethod.GET, RequestMethod.POST})
+    public  ModelAndView getSyncPointVList(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                                 @RequestParam(value = "page", required = false) String page,
+                                                 @RequestParam(value = "start", required = false) String start,
+                                                 @RequestParam(value = "limit", required = false) String limit,
+                                                 @RequestParam(value = "sort", required = false) String sort,
+                                                 HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = dataViewController.ytiotVDataService.getSyncPointVList(jsonObject.toString(), page, start, limit, sort);
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/getSyncDataVList", method = {RequestMethod.GET, RequestMethod.POST})
+    public  ModelAndView getSyncDataVList(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                                @RequestParam(value = "page", required = false) String page,
+                                                @RequestParam(value = "start", required = false) String start,
+                                                @RequestParam(value = "limit", required = false) String limit,
+                                                @RequestParam(value = "sort", required = false) String sort,
+                                                HttpServletRequest request) {
+
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = dataViewController.ytiotVDataService.getSyncDataVList(jsonObject.toString(), page, start, limit, sort);
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/getSyncDataQList", method = {RequestMethod.GET, RequestMethod.POST})
+    public  ModelAndView getSyncDataQList(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                                @RequestParam(value = "page", required = false) String page,
+                                                @RequestParam(value = "start", required = false) String start,
+                                                @RequestParam(value = "limit", required = false) String limit,
+                                                @RequestParam(value = "sort", required = false) String sort,
+                                                HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = dataViewController.ytiotVDataService.getSyncDataQList(jsonObject.toString(), page, start, limit, sort);
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/getSyncwaterDataVList", method = {RequestMethod.GET, RequestMethod.POST})
+    public  ModelAndView getSyncwaterDataVList(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                                     @RequestParam(value = "page", required = false) String page,
+                                                     @RequestParam(value = "start", required = false) String start,
+                                                     @RequestParam(value = "limit", required = false) String limit,
+                                                     @RequestParam(value = "sort", required = false) String sort,
+                                                     HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = dataViewController.ytiotVDataService.getSyncwaterDataVList(jsonObject.toString(), page, start, limit, sort);
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/getSyncDataRList", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView getSyncDataRList(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                                @RequestParam(value = "page", required = false) String page,
+                                                @RequestParam(value = "start", required = false) String start,
+                                                @RequestParam(value = "limit", required = false) String limit,
+                                                @RequestParam(value = "sort", required = false) String sort,
+                                                HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = dataViewController.ytiotVDataService.getSyncDataRList(jsonObject.toString(), page, start, limit, sort);
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/getSyncrtuDataVList", method = {RequestMethod.GET, RequestMethod.POST})
+    public  ModelAndView getSyncrtuDataVList(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                                   @RequestParam(value = "page", required = false) String page,
+                                                   @RequestParam(value = "start", required = false) String start,
+                                                   @RequestParam(value = "limit", required = false) String limit,
+                                                   @RequestParam(value = "sort", required = false) String sort,
+                                                   HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = dataViewController.ytiotVDataService.getSyncrtuDataVList(jsonObject.toString(), page, start, limit, sort);
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/getSyncDataFList", method = {RequestMethod.GET, RequestMethod.POST})
+    public  ModelAndView getSyncDataFList(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                                @RequestParam(value = "page", required = false) String page,
+                                                @RequestParam(value = "start", required = false) String start,
+                                                @RequestParam(value = "limit", required = false) String limit,
+                                                @RequestParam(value = "sort", required = false) String sort,
+                                                HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = dataViewController.ytiotVDataService.getSyncDataFList(jsonObject.toString(), page, start, limit, sort);
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/getSyncfireDataVList", method = {RequestMethod.GET, RequestMethod.POST})
+    public  ModelAndView getSyncfireDataVList(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                                    @RequestParam(value = "page", required = false) String page,
+                                                    @RequestParam(value = "start", required = false) String start,
+                                                    @RequestParam(value = "limit", required = false) String limit,
+                                                    @RequestParam(value = "sort", required = false) String sort,
+                                                    HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = dataViewController.ytiotVDataService.getSyncfireDataVList(jsonObject.toString(), page, start, limit, sort);
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/getSyncDataVListByCompany", method = {RequestMethod.GET, RequestMethod.POST})
+    public  ModelAndView getSyncDataVListByCompany(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                                         HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = dataViewController.ytiotVDataService.getSyncDataVListByCompany(jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
 //	@RequestMapping(value="/getSyncDataFexcelList",method= {RequestMethod.GET,RequestMethod.POST})
 //	public static ModelAndView  getSyncDataFexcelList(@RequestParam(value = "queryJson", required = false) String queryJson) {
 //		ModelAndView mav = new ModelAndView();
@@ -201,54 +333,95 @@ public class DataViewController {
 //		}
 //		return mav;
 //	}
-	
-	@RequestMapping(value="/getSyncDataByDays",method= {RequestMethod.GET,RequestMethod.POST})
-	public static ModelAndView  getConfirmStatusByDays(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		// TODO Auto-generated constructor stub
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret = dataViewController.ytiotVDataService.getSyncDataByDays(queryJson);
+
+    @RequestMapping(value = "/getSyncDataByDays", method = {RequestMethod.GET, RequestMethod.POST})
+    public  ModelAndView getConfirmStatusByDays(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                                      HttpServletRequest request) {
+        // TODO Auto-generated constructor stub
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = dataViewController.ytiotVDataService.getSyncDataByDays(jsonObject.toString());
 //			System.out.println(ret);
-			mav.addObject("ret_str", ret);
-			
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-	@RequestMapping(value="/getSyncStatusVList",method= {RequestMethod.GET,RequestMethod.POST})
-	public static ModelAndView  getSyncStatusVList(@RequestParam(value = "queryJson", required = false) String queryJson,
-			@RequestParam(value = "page", required = false) String page,
-			@RequestParam(value = "start", required = false) String start,
-			@RequestParam(value = "limit", required = false) String limit,
-			@RequestParam(value = "sort", required = false) String sort) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-		try {
-			String ret = dataViewController.ytiotVDataService.getSyncStatusVList(queryJson, page, start, limit, sort);
-			mav.addObject("ret_str", ret);
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-	@RequestMapping(value="/getSyncStatusVListByCompany",method= {RequestMethod.GET,RequestMethod.POST})
-	public static ModelAndView  getSyncStatusVListByCompany(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-		try {
-			String ret = dataViewController.ytiotVDataService.getSyncStatusVListByCompany(queryJson);
-			mav.addObject("ret_str", ret);
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/getSyncStatusVList", method = {RequestMethod.GET, RequestMethod.POST})
+    public  ModelAndView getSyncStatusVList(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                                  @RequestParam(value = "page", required = false) String page,
+                                                  @RequestParam(value = "start", required = false) String start,
+                                                  @RequestParam(value = "limit", required = false) String limit,
+                                                  @RequestParam(value = "sort", required = false) String sort,
+                                                  HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = dataViewController.ytiotVDataService.getSyncStatusVList(jsonObject.toString(), page, start, limit, sort);
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/getSyncStatusVListByCompany", method = {RequestMethod.GET, RequestMethod.POST})
+    public  ModelAndView getSyncStatusVListByCompany(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                                           HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = dataViewController.ytiotVDataService.getSyncStatusVListByCompany(jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
 }

src/cn/com/usky/iot/controller/EventProcessingController.java

@@ -2,7 +2,14 @@ package cn.com.usky.iot.controller;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 
+import cn.com.usky.iot.auth.TokenAuthBO;
+import cn.com.usky.iot.auth.TokenAuthService;
+import cn.com.usky.iot.controller.login.Constants;
+import cn.com.usky.iot.entity.YtiotTAdmin;
+import cn.com.usky.utils.HttpServletRequestUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -15,158 +22,265 @@ import cn.com.usky.iot.xjeventprocessing.service.YtiotXjEventProcessingService;
 @RequestMapping("/iot/xjeventprocessing")
 public class EventProcessingController {
 
-	@Resource
-	private YtiotXjEventProcessingService ytiotXjEventProcessingService;
-	
-	private static EventProcessingController eventprocessingController;
-	
-	
-	 @PostConstruct
-	 public void init() {
-		 eventprocessingController = this;
-		 eventprocessingController.ytiotXjEventProcessingService = this.ytiotXjEventProcessingService;
-	 }
-
-	@RequestMapping(value="/getList",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView  getList(@RequestParam(value = "queryJson", required = false) String queryJson,
-			@RequestParam(value = "page", required = false) String page,
-			@RequestParam(value = "start", required = false) String start,
-			@RequestParam(value = "limit", required = false) String limit,
-			@RequestParam(value = "sort", required = false) String sort) {
-		// TODO Auto-generated constructor stub
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  eventprocessingController.ytiotXjEventProcessingService.getEventProcessingList(queryJson,page,start,limit,sort);
+    @Resource
+    private YtiotXjEventProcessingService ytiotXjEventProcessingService;
+
+    private static EventProcessingController eventprocessingController;
+
+
+    @PostConstruct
+    public void init() {
+        eventprocessingController = this;
+        eventprocessingController.ytiotXjEventProcessingService = this.ytiotXjEventProcessingService;
+    }
+
+    @Autowired
+    private TokenAuthService tokenAuthService;
+
+    @RequestMapping(value = "/getList", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView getList(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                @RequestParam(value = "page", required = false) String page,
+                                @RequestParam(value = "start", required = false) String start,
+                                @RequestParam(value = "limit", required = false) String limit,
+                                @RequestParam(value = "sort", required = false) String sort,
+                                HttpServletRequest request) {
+        // TODO Auto-generated constructor stub
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = eventprocessingController.ytiotXjEventProcessingService.getEventProcessingList(jsonObject.toString(), page, start, limit, sort);
 //			System.out.println(ret);
-			mav.addObject("ret_str", ret);
-			
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-//指派
-	@RequestMapping(value="/updatezp",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView updatezp(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  eventprocessingController.ytiotXjEventProcessingService.updateEventProcessingzp(queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-//审核
-	@RequestMapping(value="/updatesh",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView updatesh(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  eventprocessingController.ytiotXjEventProcessingService.updateEventProcessingsh(queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-//上报详情
-	@RequestMapping(value="/getReportDetailsList",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView getReportDetailsList(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret = eventprocessingController.ytiotXjEventProcessingService.getReportDetailsList(queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-//人员指派记录
-	@RequestMapping(value="/getAssignJlList",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView  getAssignJlList(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		// TODO Auto-generated constructor stub
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  eventprocessingController.ytiotXjEventProcessingService.getAssignJlList(queryJson);
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    //指派
+    @RequestMapping(value = "/updatezp", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView updatezp(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                 HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = eventprocessingController.ytiotXjEventProcessingService.updateEventProcessingzp(jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    //审核
+    @RequestMapping(value = "/updatesh", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView updatesh(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                 HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = eventprocessingController.ytiotXjEventProcessingService.updateEventProcessingsh(jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    //上报详情
+    @RequestMapping(value = "/getReportDetailsList", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView getReportDetailsList(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                             HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = eventprocessingController.ytiotXjEventProcessingService.getReportDetailsList(jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    //人员指派记录
+    @RequestMapping(value = "/getAssignJlList", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView getAssignJlList(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                        HttpServletRequest request) {
+        // TODO Auto-generated constructor stub
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = eventprocessingController.ytiotXjEventProcessingService.getAssignJlList(jsonObject.toString());
 //			System.out.println(ret);
-			mav.addObject("ret_str", ret);
-			
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
-
-//未审核、已完成、超时完成、审核未通过中处理状态及处理反馈数据
-	@RequestMapping(value="/getNotAudited",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView  getNotAudited(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		// TODO Auto-generated constructor stub
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  eventprocessingController.ytiotXjEventProcessingService.getNotAudited(queryJson);
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    //未审核、已完成、超时完成、审核未通过中处理状态及处理反馈数据
+    @RequestMapping(value = "/getNotAudited", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView getNotAudited(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                      HttpServletRequest request) {
+        // TODO Auto-generated constructor stub
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = eventprocessingController.ytiotXjEventProcessingService.getNotAudited(jsonObject.toString());
 //			System.out.println(ret);
-			mav.addObject("ret_str", ret);
-			
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
-
-//未审核、已完成、超时完成、审核未通过中反馈与审核记录数据
-	@RequestMapping(value="/getFeedback",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView  getFeedback(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		// TODO Auto-generated constructor stub
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  eventprocessingController.ytiotXjEventProcessingService.getFeedback(queryJson);
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    //未审核、已完成、超时完成、审核未通过中反馈与审核记录数据
+    @RequestMapping(value = "/getFeedback", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView getFeedback(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                    HttpServletRequest request) {
+        // TODO Auto-generated constructor stub
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = eventprocessingController.ytiotXjEventProcessingService.getFeedback(jsonObject.toString());
 //			System.out.println(ret);
-			mav.addObject("ret_str", ret);
-			
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-//维修责任人下拉框
-	@RequestMapping(value="/getwxzrr",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView  getwxzrr(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		// TODO Auto-generated constructor stub
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  eventprocessingController.ytiotXjEventProcessingService.getwxzrr(queryJson);
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    //维修责任人下拉框
+    @RequestMapping(value = "/getwxzrr", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView getwxzrr(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                 HttpServletRequest request) {
+        // TODO Auto-generated constructor stub
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = eventprocessingController.ytiotXjEventProcessingService.getwxzrr(jsonObject.toString());
 //			System.out.println(ret);
-			mav.addObject("ret_str", ret);
-			
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
 }

src/cn/com/usky/iot/controller/ExcelController.java

@@ -2,7 +2,14 @@ package cn.com.usky.iot.controller;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 
+import cn.com.usky.iot.auth.TokenAuthBO;
+import cn.com.usky.iot.auth.TokenAuthService;
+import cn.com.usky.iot.controller.login.Constants;
+import cn.com.usky.iot.entity.YtiotTAdmin;
+import cn.com.usky.utils.HttpServletRequestUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -15,473 +22,896 @@ import cn.com.usky.iot.excel.service.ExcelService;
 @RequestMapping("/iot/excel/view")
 public class ExcelController {
 
-	@Resource
-	private ExcelService excelService;
-	
-	private static ExcelController excelController;
-	
-	
-	 @PostConstruct
-	 public void init() {
-		 excelController = this;
-		 excelController.excelService = this.excelService;
-	 }
-
-	
-	//导出
-	@RequestMapping(value="/exportexl",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView exportexl(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret = excelController.excelService.fileDormExport("/var/lib/tomcat/webapps/YtIoT/",queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	@RequestMapping(value="/waterexportexl",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView waterexportexl(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret = excelController.excelService.waterDormExport("/var/lib/tomcat/webapps/YtIoT/",queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	@RequestMapping(value="/rtuexportexl",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView rtuexportexl(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret = excelController.excelService.rtuDormExport("/var/lib/tomcat/webapps/YtIoT/",queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-	@RequestMapping(value="/fireAlarmExcel",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView fireAlarmExcel(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret = excelController.excelService.fireAlarmExcel("/var/lib/tomcat/webapps/YtIoT/",queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-	@RequestMapping(value="/EfireAlarmExcel",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView EfireAlarmExcel(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret = excelController.excelService.EfireAlarmExcel("/var/lib/tomcat/webapps/YtIoT/",queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-	@RequestMapping(value="/waterAlarmExcel",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView waterAlarmExcel(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret = excelController.excelService.waterAlarmExcel("/var/lib/tomcat/webapps/YtIoT/",queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-	@RequestMapping(value="/RTUAlarmExcel",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView RTUAlarmExcel(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret = excelController.excelService.RTUAlarmExcel("/var/lib/tomcat/webapps/YtIoT/",queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-	@RequestMapping(value="/liftAlarmExcel",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView liftAlarmExcel(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret = excelController.excelService.liftAlarmExcel("/var/lib/tomcat/webapps/YtIoT/",queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-
-	@RequestMapping(value="/Exportexl",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView Exportexl(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret = excelController.excelService.DormExport("/var/lib/tomcat/webapps/YtIoT/",queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-	@RequestMapping(value="/patrolplanExcel",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView patrolplanExcel(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret = excelController.excelService.patrolplanExcel("/var/lib/tomcat/webapps/YtIoT/",queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-	@RequestMapping(value="/inspectionrecordExcel",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView inspectionrecordExcel(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret = excelController.excelService.inspectionrecordExcel("/var/lib/tomcat/webapps/YtIoT/",queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-	@RequestMapping(value="/checkrecordExcel",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView checkrecordExcel(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret = excelController.excelService.checkrecordExcel("/var/lib/tomcat/webapps/YtIoT/",queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-	@RequestMapping(value="/routeExcel",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView routeExcel(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret = excelController.excelService.routeExcel("/var/lib/tomcat/webapps/YtIoT/",queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-	@RequestMapping(value="/inspectorsExcel",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView inspectorsExcel(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret = excelController.excelService.inspectorsExcel("/var/lib/tomcat/webapps/YtIoT/",queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-	@RequestMapping(value="/patrolpointExcel",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView patrolpointExcel(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret = excelController.excelService.patrolpointExcel("/var/lib/tomcat/webapps/YtIoT/",queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-	@RequestMapping(value="/qrcodeanalysisExcel",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView qrcodeanalysisExcel(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret = excelController.excelService.qrcodeanalysisExcel("/var/lib/tomcat/webapps/YtIoT/",queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-	@RequestMapping(value="/maintenanceplanExcel",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView maintenanceplanExcel(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret = excelController.excelService.maintenanceplanExcel("/var/lib/tomcat/webapps/YtIoT/",queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-	@RequestMapping(value="/checkrecord2Excel",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView checkrecord2Excel(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret = excelController.excelService.checkrecord2Excel("/var/lib/tomcat/webapps/YtIoT/",queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-	@RequestMapping(value="/maintenancerecordExcel",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView maintenancerecordExcel(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret = excelController.excelService.maintenancerecordExcel("/var/lib/tomcat/webapps/YtIoT/",queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-	@RequestMapping(value="/route2Excel",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView route2Excel(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret = excelController.excelService.route2Excel("/var/lib/tomcat/webapps/YtIoT/",queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-	@RequestMapping(value="/maintenanceExcel",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView maintenanceExcel(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret = excelController.excelService.maintenanceExcel("/var/lib/tomcat/webapps/YtIoT/",queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-	@RequestMapping(value="/maintenancepersonExcel",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView maintenancepersonExcel(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret = excelController.excelService.maintenancepersonExcel("/var/lib/tomcat/webapps/YtIoT/",queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-	@RequestMapping(value="/qrcodeanalysis2Excel",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView qrcodeanalysis2Excel(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret = excelController.excelService.qrcodeanalysis2Excel("/var/lib/tomcat/webapps/YtIoT/",queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-	@RequestMapping(value="/XjInspectionPointsExcel",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView InspectionPointsExcel(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret = excelController.excelService.XjInspectionPointsExcel("/var/lib/tomcat/webapps/YtIoT/",queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-	@RequestMapping(value="/XjInspectionPointsExcel1",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView InspectionPointsExcel1(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret = excelController.excelService.XjInspectionPointsExcel1("/var/lib/tomcat/webapps/YtIoT/",queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-	
-	@RequestMapping(value="/XjInspectorsExcel",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView InspectorsExcel(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret = excelController.excelService.XjInspectorsExcel("/var/lib/tomcat/webapps/YtIoT/",queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-	@RequestMapping(value="/XjPlanMasterExcel",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView PlanMasterExcel(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret = excelController.excelService.XjPlanMasterExcel("/var/lib/tomcat/webapps/YtIoT/",queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-	//巡检
-	@RequestMapping(value="/XjPlanMasterExcel1",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView PlanMasterExcel1(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret = excelController.excelService.XjPlanMasterExcel1("/var/lib/tomcat/webapps/YtIoT/",queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-	@RequestMapping(value="/XjSpotOperationRecordExcel",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView SpotOperationRecordExcel(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret = excelController.excelService.XjSpotOperationRecordExcel("/var/lib/tomcat/webapps/YtIoT/",queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	//巡检
-	@RequestMapping(value="/XjSpotOperationRecordExcel1",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView SpotOperationRecordExcel1(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret = excelController.excelService.XjSpotOperationRecordExcel1("/var/lib/tomcat/webapps/YtIoT/",queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-	//巡检
-		@RequestMapping(value="/EventProcessingExcel",method= {RequestMethod.GET,RequestMethod.POST})
-		public ModelAndView EventProcessingExcel(@RequestParam(value = "queryJson", required = false) String queryJson) {
-			ModelAndView mav = new ModelAndView();
-			mav.setViewName("return");
-//			System.out.println(queryJson);
-			try {
-				String ret = excelController.excelService.EventProcessingExcel("/var/lib/tomcat/webapps/YtIoT/",queryJson);
-				mav.addObject("ret_str",ret);
-			} catch (Exception e) {
-				e.printStackTrace();
-			}
-			return mav;
-		}
-
-	/**
-	 * 视频导出数据
-	 * @param queryJson
-	 * @return
-	 */
-	@RequestMapping(value="/VideoAlarmExcel",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView VideoAlarmExcel(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			//String ret = excelController.excelService.VideoAlarmExcel("/var/lib/tomcat/webapps/YtIoT/",queryJson);
-			String ret = excelController.excelService.VideoAlarmExcel("/var/lib/tomcat/webapps/YtIoT/",queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
+    @Resource
+    private ExcelService excelService;
+
+    private static ExcelController excelController;
+
+
+    @PostConstruct
+    public void init() {
+        excelController = this;
+        excelController.excelService = this.excelService;
+    }
+
+    @Autowired
+    private TokenAuthService tokenAuthService;
+
+
+    //导出
+    @RequestMapping(value = "/exportexl", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView exportexl(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                  HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = excelController.excelService.fileDormExport("/var/lib/tomcat/webapps/YtIoT/", jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/waterexportexl", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView waterexportexl(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                       HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = excelController.excelService.waterDormExport("/var/lib/tomcat/webapps/YtIoT/", jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/rtuexportexl", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView rtuexportexl(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                     HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = excelController.excelService.rtuDormExport("/var/lib/tomcat/webapps/YtIoT/", jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/fireAlarmExcel", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView fireAlarmExcel(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                       HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = excelController.excelService.fireAlarmExcel("/var/lib/tomcat/webapps/YtIoT/", jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/EfireAlarmExcel", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView EfireAlarmExcel(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                        HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = excelController.excelService.EfireAlarmExcel("/var/lib/tomcat/webapps/YtIoT/", jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/waterAlarmExcel", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView waterAlarmExcel(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                        HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = excelController.excelService.waterAlarmExcel("/var/lib/tomcat/webapps/YtIoT/", jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/RTUAlarmExcel", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView RTUAlarmExcel(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                      HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = excelController.excelService.RTUAlarmExcel("/var/lib/tomcat/webapps/YtIoT/", jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/liftAlarmExcel", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView liftAlarmExcel(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                       HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = excelController.excelService.liftAlarmExcel("/var/lib/tomcat/webapps/YtIoT/", jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/Exportexl", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView Exportexl(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                  HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = excelController.excelService.DormExport("/var/lib/tomcat/webapps/YtIoT/", jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/patrolplanExcel", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView patrolplanExcel(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                        HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = excelController.excelService.patrolplanExcel("/var/lib/tomcat/webapps/YtIoT/", jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/inspectionrecordExcel", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView inspectionrecordExcel(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                              HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = excelController.excelService.inspectionrecordExcel("/var/lib/tomcat/webapps/YtIoT/", jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/checkrecordExcel", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView checkrecordExcel(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                         HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = excelController.excelService.checkrecordExcel("/var/lib/tomcat/webapps/YtIoT/", jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/routeExcel", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView routeExcel(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                   HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = excelController.excelService.routeExcel("/var/lib/tomcat/webapps/YtIoT/", jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/inspectorsExcel", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView inspectorsExcel(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                        HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = excelController.excelService.inspectorsExcel("/var/lib/tomcat/webapps/YtIoT/", jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/patrolpointExcel", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView patrolpointExcel(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                         HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = excelController.excelService.patrolpointExcel("/var/lib/tomcat/webapps/YtIoT/", jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/qrcodeanalysisExcel", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView qrcodeanalysisExcel(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                            HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = excelController.excelService.qrcodeanalysisExcel("/var/lib/tomcat/webapps/YtIoT/", jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/maintenanceplanExcel", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView maintenanceplanExcel(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                             HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = excelController.excelService.maintenanceplanExcel("/var/lib/tomcat/webapps/YtIoT/", jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/checkrecord2Excel", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView checkrecord2Excel(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                          HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = excelController.excelService.checkrecord2Excel("/var/lib/tomcat/webapps/YtIoT/", jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/maintenancerecordExcel", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView maintenancerecordExcel(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                               HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = excelController.excelService.maintenancerecordExcel("/var/lib/tomcat/webapps/YtIoT/", jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/route2Excel", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView route2Excel(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                    HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = excelController.excelService.route2Excel("/var/lib/tomcat/webapps/YtIoT/", jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/maintenanceExcel", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView maintenanceExcel(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                         HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = excelController.excelService.maintenanceExcel("/var/lib/tomcat/webapps/YtIoT/", jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/maintenancepersonExcel", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView maintenancepersonExcel(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                               HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = excelController.excelService.maintenancepersonExcel("/var/lib/tomcat/webapps/YtIoT/", jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/qrcodeanalysis2Excel", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView qrcodeanalysis2Excel(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                             HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = excelController.excelService.qrcodeanalysis2Excel("/var/lib/tomcat/webapps/YtIoT/", jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/XjInspectionPointsExcel", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView InspectionPointsExcel(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                              HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = excelController.excelService.XjInspectionPointsExcel("/var/lib/tomcat/webapps/YtIoT/", jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/XjInspectionPointsExcel1", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView InspectionPointsExcel1(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                               HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = excelController.excelService.XjInspectionPointsExcel1("/var/lib/tomcat/webapps/YtIoT/", jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+
+    @RequestMapping(value = "/XjInspectorsExcel", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView InspectorsExcel(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                        HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = excelController.excelService.XjInspectorsExcel("/var/lib/tomcat/webapps/YtIoT/", jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/XjPlanMasterExcel", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView PlanMasterExcel(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                        HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = excelController.excelService.XjPlanMasterExcel("/var/lib/tomcat/webapps/YtIoT/", jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    //巡检
+    @RequestMapping(value = "/XjPlanMasterExcel1", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView PlanMasterExcel1(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                         HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = excelController.excelService.XjPlanMasterExcel1("/var/lib/tomcat/webapps/YtIoT/", jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/XjSpotOperationRecordExcel", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView SpotOperationRecordExcel(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                                 HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = excelController.excelService.XjSpotOperationRecordExcel("/var/lib/tomcat/webapps/YtIoT/", jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    //巡检
+    @RequestMapping(value = "/XjSpotOperationRecordExcel1", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView SpotOperationRecordExcel1(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                                  HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = excelController.excelService.XjSpotOperationRecordExcel1("/var/lib/tomcat/webapps/YtIoT/", jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    //巡检
+    @RequestMapping(value = "/EventProcessingExcel", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView EventProcessingExcel(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                             HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = excelController.excelService.EventProcessingExcel("/var/lib/tomcat/webapps/YtIoT/", jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    /**
+     * 视频导出数据
+     *
+     * @param queryJson
+     * @return
+     */
+    @RequestMapping(value = "/VideoAlarmExcel", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView VideoAlarmExcel(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                        HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            //String ret = excelController.excelService.VideoAlarmExcel("/var/lib/tomcat/webapps/YtIoT/",queryJson);
+            String ret = excelController.excelService.VideoAlarmExcel("/var/lib/tomcat/webapps/YtIoT/", jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
 
 }

src/cn/com/usky/iot/controller/FrontpageController.java

@@ -39,11 +39,25 @@ public class FrontpageController {
     private TokenAuthService tokenAuthService;
 
     @RequestMapping(value = "/getFrontpageQuery", method = {RequestMethod.GET, RequestMethod.POST})
-    public ModelAndView getFrontpageQuery(@RequestParam(value = "queryJson", required = false) String queryJson) {
+    public ModelAndView getFrontpageQuery(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                          HttpServletRequest request) {
         ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            JSONObject json = new JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
         mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        JSONObject jsonObject = JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
         try {
-            String ret = frontpageController.ytiotFrontpageQueryService.getFrontpageQuery(queryJson);
+            String ret = frontpageController.ytiotFrontpageQueryService.getFrontpageQuery(jsonObject.toString());
             mav.addObject("ret_str", ret);
         } catch (Exception e) {
             // TODO Auto-generated catch block
@@ -54,13 +68,10 @@ public class FrontpageController {
 
     @AutoLog("单位详情页数据获取")
     @RequestMapping(value = "/getCurrentObjectListByCompanyId", method = {RequestMethod.GET, RequestMethod.POST})
-    public ModelAndView getCurrentObjectListByCompanyId(
-            @RequestParam(value = "queryJson", required = false) String queryJson,
-            HttpServletRequest request,
-            HttpServletResponse response
+    public ModelAndView getCurrentObjectListByCompanyId(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                                        HttpServletRequest request
     ) {
         ModelAndView mav = new ModelAndView();
-
         TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
         boolean isAuth = tokenAuthBO.isAuthState();
         if (!isAuth) {
@@ -93,11 +104,24 @@ public class FrontpageController {
                                      @RequestParam(value = "page", required = false) String page,
                                      @RequestParam(value = "start", required = false) String start,
                                      @RequestParam(value = "limit", required = false) String limit,
-                                     @RequestParam(value = "sort", required = false) String sort) {
+                                     @RequestParam(value = "sort", required = false) String sort,
+                                     HttpServletRequest request) {
         ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            JSONObject json = new JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
         mav.setViewName("return");
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        JSONObject jsonObject = JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
         try {
-            String ret = frontpageController.ytiotFrontpageQueryService.getAlarmList(queryJson, page, start, limit, sort);
+            String ret = frontpageController.ytiotFrontpageQueryService.getAlarmList(jsonObject.toString(), page, start, limit, sort);
             mav.addObject("ret_str", ret);
         } catch (Exception e) {
             // TODO Auto-generated catch block
@@ -107,14 +131,25 @@ public class FrontpageController {
     }
 
     @RequestMapping(value = "/updateAlarm", method = {RequestMethod.GET, RequestMethod.POST})
-    public static ModelAndView updateAlarm(@RequestParam(value = "queryJson", required = false) String queryJson) {
+    public ModelAndView updateAlarm(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                    HttpServletRequest request) {
         // TODO Auto-generated constructor stub
         ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            JSONObject json = new JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
         mav.setViewName("return");
-//		System.out.println(queryJson);
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        JSONObject jsonObject = JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
         try {
-            String ret = frontpageController.ytiotFrontpageQueryService.updateAlarm(queryJson);
-//			System.out.println(ret);
+            String ret = frontpageController.ytiotFrontpageQueryService.updateAlarm(jsonObject.toString());
             mav.addObject("ret_str", ret);
 
         } catch (Exception e) {
@@ -125,11 +160,24 @@ public class FrontpageController {
     }
 
     @RequestMapping(value = "/getCurrentStatus", method = {RequestMethod.GET, RequestMethod.POST})
-    public ModelAndView getCurrentStatus(@RequestParam(value = "queryJson", required = false) String queryJson) {
+    public ModelAndView getCurrentStatus(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                         HttpServletRequest request) {
         ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            JSONObject json = new JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
         mav.setViewName("return");
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        JSONObject jsonObject = JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
         try {
-            String ret = frontpageController.ytiotFrontpageQueryService.getCurrentStatus(queryJson);
+            String ret = frontpageController.ytiotFrontpageQueryService.getCurrentStatus(jsonObject.toString());
             mav.addObject("ret_str", ret);
         } catch (Exception e) {
             // TODO Auto-generated catch block

src/cn/com/usky/iot/controller/InspectionPointsController.java

@@ -5,6 +5,12 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import cn.com.usky.iot.auth.TokenAuthBO;
+import cn.com.usky.iot.auth.TokenAuthService;
+import cn.com.usky.iot.controller.login.Constants;
+import cn.com.usky.iot.entity.YtiotTAdmin;
+import cn.com.usky.utils.HttpServletRequestUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -22,186 +28,304 @@ import cn.com.usky.iot.xjinspectionpoints.service.YtiotXjInspectionPointsService
 @RequestMapping("/iot/inspectionpoints")
 public class InspectionPointsController {
 
-	@Resource
-	private YtiotXjInspectionPointsService ytiotXjInspectionPointsService;
-	
-	private static InspectionPointsController inspectionpointsController;
-	
-	
-	 @PostConstruct
-	 public void init() {
-		 inspectionpointsController = this;
-		 inspectionpointsController.ytiotXjInspectionPointsService = this.ytiotXjInspectionPointsService;
-	 }
-
-	@RequestMapping(value="/getList",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView  getList(@RequestParam(value = "queryJson", required = false) String queryJson,
-			@RequestParam(value = "page", required = false) String page,
-			@RequestParam(value = "start", required = false) String start,
-			@RequestParam(value = "limit", required = false) String limit,
-			@RequestParam(value = "sort", required = false) String sort
-			) {
-		// TODO Auto-generated constructor stub
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  inspectionpointsController.ytiotXjInspectionPointsService.getInspectionPointsList(queryJson,page,start,limit,sort);
+    @Resource
+    private YtiotXjInspectionPointsService ytiotXjInspectionPointsService;
+
+    private static InspectionPointsController inspectionpointsController;
+
+
+    @PostConstruct
+    public void init() {
+        inspectionpointsController = this;
+        inspectionpointsController.ytiotXjInspectionPointsService = this.ytiotXjInspectionPointsService;
+    }
+
+    @Autowired
+    private TokenAuthService tokenAuthService;
+
+    @RequestMapping(value = "/getList", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView getList(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                @RequestParam(value = "page", required = false) String page,
+                                @RequestParam(value = "start", required = false) String start,
+                                @RequestParam(value = "limit", required = false) String limit,
+                                @RequestParam(value = "sort", required = false) String sort,
+                                HttpServletRequest request
+    ) {
+        // TODO Auto-generated constructor stub
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = inspectionpointsController.ytiotXjInspectionPointsService.getInspectionPointsList(jsonObject.toString(), page, start, limit, sort);
 //			System.out.println(ret);
-			mav.addObject("ret_str", ret);
-			
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-	@RequestMapping(value="/getList1",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView  getList1(@RequestParam(value = "queryJson", required = false) String queryJson,
-			@RequestParam(value = "page", required = false) String page,
-			@RequestParam(value = "start", required = false) String start,
-			@RequestParam(value = "limit", required = false) String limit,
-			@RequestParam(value = "sort", required = false) String sort
-			) {
-		// TODO Auto-generated constructor stub
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  inspectionpointsController.ytiotXjInspectionPointsService.getInspectionPointsList1(queryJson,page,start,limit,sort);
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/getList1", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView getList1(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                 @RequestParam(value = "page", required = false) String page,
+                                 @RequestParam(value = "start", required = false) String start,
+                                 @RequestParam(value = "limit", required = false) String limit,
+                                 @RequestParam(value = "sort", required = false) String sort,
+                                 HttpServletRequest request
+    ) {
+        // TODO Auto-generated constructor stub
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = inspectionpointsController.ytiotXjInspectionPointsService.getInspectionPointsList1(jsonObject.toString(), page, start, limit, sort);
 //			System.out.println(ret);
-			mav.addObject("ret_str", ret);
-			
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-
-	@RequestMapping(value="/append",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView append(@RequestParam(value = "queryJson", required = false) String queryJson) {	
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  inspectionpointsController.ytiotXjInspectionPointsService.appendInspectionPoints(queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-	@RequestMapping(value="/append1",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView append1(@RequestParam(value = "queryJson", required = false) String queryJson) {	
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  inspectionpointsController.ytiotXjInspectionPointsService.appendInspectionPoints1(queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-	
-	
-
-	@RequestMapping(value="/update",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView update(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  inspectionpointsController.ytiotXjInspectionPointsService.updateInspectionPoints(queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-	@RequestMapping(value="/update1",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView update1(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  inspectionpointsController.ytiotXjInspectionPointsService.updateInspectionPoints1(queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-
-	@RequestMapping(value="/del",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView del(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret = inspectionpointsController.ytiotXjInspectionPointsService.deleteInspectionPoints(queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-	//全部设备
-	@RequestMapping(value="/getSbList",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView  getSbList(@RequestParam(value = "queryJson", required = false) String queryJson,
-			@RequestParam(value = "page", required = false) String page,
-			@RequestParam(value = "start", required = false) String start,
-			@RequestParam(value = "limit", required = false) String limit,
-			@RequestParam(value = "sort", required = false) String sort
-			) {
-		// TODO Auto-generated constructor stub
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  inspectionpointsController.ytiotXjInspectionPointsService.getSbList(queryJson,page,start,limit,sort);
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+
+    @RequestMapping(value = "/append", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView append(@RequestParam(value = "queryJson", required = false) String queryJson,
+                               HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = inspectionpointsController.ytiotXjInspectionPointsService.appendInspectionPoints(jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/append1", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView append1(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = inspectionpointsController.ytiotXjInspectionPointsService.appendInspectionPoints1(jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+
+    @RequestMapping(value = "/update", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView update(@RequestParam(value = "queryJson", required = false) String queryJson,
+                               HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = inspectionpointsController.ytiotXjInspectionPointsService.updateInspectionPoints(jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/update1", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView update1(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = inspectionpointsController.ytiotXjInspectionPointsService.updateInspectionPoints1(jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+
+    @RequestMapping(value = "/del", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView del(@RequestParam(value = "queryJson", required = false) String queryJson,
+                            HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = inspectionpointsController.ytiotXjInspectionPointsService.deleteInspectionPoints(jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    //全部设备
+    @RequestMapping(value = "/getSbList", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView getSbList(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                  @RequestParam(value = "page", required = false) String page,
+                                  @RequestParam(value = "start", required = false) String start,
+                                  @RequestParam(value = "limit", required = false) String limit,
+                                  @RequestParam(value = "sort", required = false) String sort,
+                                  HttpServletRequest request
+    ) {
+        // TODO Auto-generated constructor stub
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = inspectionpointsController.ytiotXjInspectionPointsService.getSbList(jsonObject.toString(), page, start, limit, sort);
 //			System.out.println(ret);
-			mav.addObject("ret_str", ret);
-			
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-	//选中的设备
-	
-	@RequestMapping(value="/getXzsbList",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView  getXzsbList(@RequestParam(value = "queryJson", required = false) String queryJson,
-			@RequestParam(value = "page", required = false) String page,
-			@RequestParam(value = "start", required = false) String start,
-			@RequestParam(value = "limit", required = false) String limit,
-			@RequestParam(value = "sort", required = false) String sort
-			) {
-		// TODO Auto-generated constructor stub
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  inspectionpointsController.ytiotXjInspectionPointsService.getXzsbList(queryJson,page,start,limit,sort);
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    //选中的设备
+
+    @RequestMapping(value = "/getXzsbList", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView getXzsbList(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                    @RequestParam(value = "page", required = false) String page,
+                                    @RequestParam(value = "start", required = false) String start,
+                                    @RequestParam(value = "limit", required = false) String limit,
+                                    @RequestParam(value = "sort", required = false) String sort,
+                                    HttpServletRequest request
+    ) {
+        // TODO Auto-generated constructor stub
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = inspectionpointsController.ytiotXjInspectionPointsService.getXzsbList(jsonObject.toString(), page, start, limit, sort);
 //			System.out.println(ret);
-			mav.addObject("ret_str", ret);
-			
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
 
 }

src/cn/com/usky/iot/controller/InspectionRecordController.java

@@ -5,6 +5,12 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import cn.com.usky.iot.auth.TokenAuthBO;
+import cn.com.usky.iot.auth.TokenAuthService;
+import cn.com.usky.iot.controller.login.Constants;
+import cn.com.usky.iot.entity.YtiotTAdmin;
+import cn.com.usky.utils.HttpServletRequestUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -18,60 +24,90 @@ import cn.com.usky.iot.inspectionrecord.service.YtiotTInspectionRecordService;
 @RequestMapping("/iot/inspectionrecord")
 public class InspectionRecordController {
 
-	@Resource
-	private YtiotTInspectionRecordService ytiotTInspectionRecordService;
-	
-	private static InspectionRecordController inspectionrecordController;
-	
-	
-	 @PostConstruct
-	 public void init() {
-		 inspectionrecordController = this;
-		 inspectionrecordController.ytiotTInspectionRecordService = this.ytiotTInspectionRecordService;
-	 }
+    @Resource
+    private YtiotTInspectionRecordService ytiotTInspectionRecordService;
 
-	@RequestMapping(value="/getList",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView  getList(@RequestParam(value = "queryJson", required = false) String queryJson,
-			@RequestParam(value = "page", required = false) String page,
-			@RequestParam(value = "start", required = false) String start,
-			@RequestParam(value = "limit", required = false) String limit,
-			@RequestParam(value = "sort", required = false) String sort) {
-		// TODO Auto-generated constructor stub
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  inspectionrecordController.ytiotTInspectionRecordService.getInspectionRecordList(queryJson,page,start,limit,sort);
+    private static InspectionRecordController inspectionrecordController;
+
+
+    @PostConstruct
+    public void init() {
+        inspectionrecordController = this;
+        inspectionrecordController.ytiotTInspectionRecordService = this.ytiotTInspectionRecordService;
+    }
+
+    @Autowired
+    private TokenAuthService tokenAuthService;
+
+    @RequestMapping(value = "/getList", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView getList(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                @RequestParam(value = "page", required = false) String page,
+                                @RequestParam(value = "start", required = false) String start,
+                                @RequestParam(value = "limit", required = false) String limit,
+                                @RequestParam(value = "sort", required = false) String sort,
+                                HttpServletRequest request) {
+        // TODO Auto-generated constructor stub
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = inspectionrecordController.ytiotTInspectionRecordService.getInspectionRecordList(jsonObject.toString(), page, start, limit, sort);
 //			System.out.println(ret);
-			mav.addObject("ret_str", ret);
-			
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	@RequestMapping(value="/getList1",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView  getList1(@RequestParam(value = "queryJson", required = false) String queryJson,
-			@RequestParam(value = "page", required = false) String page,
-			@RequestParam(value = "start", required = false) String start,
-			@RequestParam(value = "limit", required = false) String limit,
-			@RequestParam(value = "sort", required = false) String sort) {
-		// TODO Auto-generated constructor stub
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  inspectionrecordController.ytiotTInspectionRecordService.getInspectionRecordList1(queryJson,page,start,limit,sort);
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/getList1", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView getList1(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                 @RequestParam(value = "page", required = false) String page,
+                                 @RequestParam(value = "start", required = false) String start,
+                                 @RequestParam(value = "limit", required = false) String limit,
+                                 @RequestParam(value = "sort", required = false) String sort,
+                                 HttpServletRequest request) {
+        // TODO Auto-generated constructor stub
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = inspectionrecordController.ytiotTInspectionRecordService.getInspectionRecordList1(jsonObject.toString(), page, start, limit, sort);
 //			System.out.println(ret);
-			mav.addObject("ret_str", ret);
-			
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
 
 }

src/cn/com/usky/iot/controller/InspectorsController.java

@@ -2,7 +2,14 @@ package cn.com.usky.iot.controller;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 
+import cn.com.usky.iot.auth.TokenAuthBO;
+import cn.com.usky.iot.auth.TokenAuthService;
+import cn.com.usky.iot.controller.login.Constants;
+import cn.com.usky.iot.entity.YtiotTAdmin;
+import cn.com.usky.utils.HttpServletRequestUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -15,61 +22,92 @@ import cn.com.usky.iot.inspectors.service.YtiotTInspectorsService;
 @RequestMapping("/iot/inspectors")
 public class InspectorsController {
 
-	@Resource
-	private YtiotTInspectorsService ytiotTInspectorsService;
-	
-	private static InspectorsController inspectorsController;
-	
-	
-	 @PostConstruct
-	 public void init() {
-		 inspectorsController = this;
-		 inspectorsController.ytiotTInspectorsService = this.ytiotTInspectorsService;
-	 }
-
-	@RequestMapping(value="/getList",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView  getList(@RequestParam(value = "queryJson", required = false) String queryJson,
-			@RequestParam(value = "page", required = false) String page,
-			@RequestParam(value = "start", required = false) String start,
-			@RequestParam(value = "limit", required = false) String limit,
-			@RequestParam(value = "sort", required = false) String sort) {
-		// TODO Auto-generated constructor stub
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  inspectorsController.ytiotTInspectorsService.getInspectorsList(queryJson,page,start,limit,sort);
+    @Resource
+    private YtiotTInspectorsService ytiotTInspectorsService;
+
+    private static InspectorsController inspectorsController;
+
+
+    @PostConstruct
+    public void init() {
+        inspectorsController = this;
+        inspectorsController.ytiotTInspectorsService = this.ytiotTInspectorsService;
+    }
+
+    @Autowired
+    private TokenAuthService tokenAuthService;
+
+    @RequestMapping(value = "/getList", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView getList(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                @RequestParam(value = "page", required = false) String page,
+                                @RequestParam(value = "start", required = false) String start,
+                                @RequestParam(value = "limit", required = false) String limit,
+                                @RequestParam(value = "sort", required = false) String sort,
+                                HttpServletRequest request) {
+        // TODO Auto-generated constructor stub
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = inspectorsController.ytiotTInspectorsService.getInspectorsList(jsonObject.toString(), page, start, limit, sort);
 //			System.out.println(ret);
-			mav.addObject("ret_str", ret);
-			
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	@RequestMapping(value="/getList1",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView  getList1(@RequestParam(value = "queryJson", required = false) String queryJson,
-			@RequestParam(value = "page", required = false) String page,
-			@RequestParam(value = "start", required = false) String start,
-			@RequestParam(value = "limit", required = false) String limit,
-			@RequestParam(value = "sort", required = false) String sort) {
-		// TODO Auto-generated constructor stub
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  inspectorsController.ytiotTInspectorsService.getInspectorsList1(queryJson,page,start,limit,sort);
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/getList1", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView getList1(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                 @RequestParam(value = "page", required = false) String page,
+                                 @RequestParam(value = "start", required = false) String start,
+                                 @RequestParam(value = "limit", required = false) String limit,
+                                 @RequestParam(value = "sort", required = false) String sort,
+                                 HttpServletRequest request) {
+        // TODO Auto-generated constructor stub
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = inspectorsController.ytiotTInspectorsService.getInspectorsList1(jsonObject.toString(), page, start, limit, sort);
 //			System.out.println(ret);
-			mav.addObject("ret_str", ret);
-			
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
-//	@RequestMapping(value="/getVerList",method= {RequestMethod.GET,RequestMethod.POST})
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    //	@RequestMapping(value="/getVerList",method= {RequestMethod.GET,RequestMethod.POST})
 //	public ModelAndView  getVerList(@RequestParam(value = "queryJson", required = false) String queryJson,
 //			@RequestParam(value = "page", required = false) String page,
 //			@RequestParam(value = "start", required = false) String start,
@@ -90,59 +128,114 @@ public class InspectorsController {
 //		}
 //		return mav;
 //	}
-	@RequestMapping(value="/append",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView append(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  inspectorsController.ytiotTInspectorsService.appendInspectors(queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	@RequestMapping(value="/append1",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView append1(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  inspectorsController.ytiotTInspectorsService.appendInspectors1(queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	@RequestMapping(value="/update",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView update(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  inspectorsController.ytiotTInspectorsService.updateInspectors(queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	@RequestMapping(value="/update1",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView update1(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  inspectorsController.ytiotTInspectorsService.updateInspectors1(queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	//注销
+    @RequestMapping(value = "/append", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView append(@RequestParam(value = "queryJson", required = false) String queryJson,
+                               HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = inspectorsController.ytiotTInspectorsService.appendInspectors(jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/append1", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView append1(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = inspectorsController.ytiotTInspectorsService.appendInspectors1(jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/update", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView update(@RequestParam(value = "queryJson", required = false) String queryJson,
+                               HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = inspectorsController.ytiotTInspectorsService.updateInspectors(jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/update1", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView update1(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = inspectorsController.ytiotTInspectorsService.updateInspectors1(jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+    //注销
 //	@RequestMapping(value="/del",method= {RequestMethod.GET,RequestMethod.POST})
 //	public ModelAndView del(@RequestParam(value = "queryJson", required = false) String queryJson) {
 //		ModelAndView mav = new ModelAndView();
@@ -156,8 +249,8 @@ public class InspectorsController {
 //		}
 //		return mav;
 //	}
-	
-	//导出
+
+    //导出
 //	@RequestMapping(value="/exl",method= {RequestMethod.GET,RequestMethod.POST})
 //	public ModelAndView exl(@RequestParam(value = "queryJson", required = false) String queryJson) {
 //		ModelAndView mav = new ModelAndView();

src/cn/com/usky/iot/controller/InspectorsxController.java

@@ -2,7 +2,14 @@ package cn.com.usky.iot.controller;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 
+import cn.com.usky.iot.auth.TokenAuthBO;
+import cn.com.usky.iot.auth.TokenAuthService;
+import cn.com.usky.iot.controller.login.Constants;
+import cn.com.usky.iot.entity.YtiotTAdmin;
+import cn.com.usky.utils.HttpServletRequestUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -15,163 +22,271 @@ import cn.com.usky.iot.xjinspectors.service.YtiotXjInspectorsService;
 @RequestMapping("/iot/inspectorsx")
 public class InspectorsxController {
 
-	@Resource
-	private YtiotXjInspectorsService ytiotXjInspectorsService;
-	
-	private static InspectorsxController inspectorsxController;
-	
-	
-	 @PostConstruct
-	 public void init() {
-		 inspectorsxController = this;
-		 inspectorsxController.ytiotXjInspectorsService = this.ytiotXjInspectorsService;
-	 }
-
-	@RequestMapping(value="/getList",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView  getList(@RequestParam(value = "queryJson", required = false) String queryJson,
-			@RequestParam(value = "page", required = false) String page,
-			@RequestParam(value = "start", required = false) String start,
-			@RequestParam(value = "limit", required = false) String limit,
-			@RequestParam(value = "sort", required = false) String sort) {
-		// TODO Auto-generated constructor stub
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  inspectorsxController.ytiotXjInspectorsService.getInspectorsList(queryJson,page,start,limit,sort);
+    @Resource
+    private YtiotXjInspectorsService ytiotXjInspectorsService;
+
+    private static InspectorsxController inspectorsxController;
+
+
+    @PostConstruct
+    public void init() {
+        inspectorsxController = this;
+        inspectorsxController.ytiotXjInspectorsService = this.ytiotXjInspectorsService;
+    }
+
+    @Autowired
+    private TokenAuthService tokenAuthService;
+
+    @RequestMapping(value = "/getList", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView getList(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                @RequestParam(value = "page", required = false) String page,
+                                @RequestParam(value = "start", required = false) String start,
+                                @RequestParam(value = "limit", required = false) String limit,
+                                @RequestParam(value = "sort", required = false) String sort,
+                                HttpServletRequest request) {
+        // TODO Auto-generated constructor stub
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = inspectorsxController.ytiotXjInspectorsService.getInspectorsList(jsonObject.toString(), page, start, limit, sort);
 //			System.out.println(ret);
-			mav.addObject("ret_str", ret);
-			
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-
-	@RequestMapping(value="/append",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView append(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  inspectorsxController.ytiotXjInspectorsService.appendInspectors(queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-
-	@RequestMapping(value="/update",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView update(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  inspectorsxController.ytiotXjInspectorsService.updateInspectors(queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-
-	@RequestMapping(value="/del",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView del(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret = inspectorsxController.ytiotXjInspectorsService.deleteInspectors(queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-	@RequestMapping(value="/getTeamMembersList",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView  getTeamMembersList(@RequestParam(value = "queryJson", required = false) String queryJson,
-			@RequestParam(value = "page", required = false) String page,
-			@RequestParam(value = "start", required = false) String start,
-			@RequestParam(value = "limit", required = false) String limit,
-			@RequestParam(value = "sort", required = false) String sort) {
-		// TODO Auto-generated constructor stub
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  inspectorsxController.ytiotXjInspectorsService.getTeamMembersList(queryJson,page,start,limit,sort);
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+
+    @RequestMapping(value = "/append", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView append(@RequestParam(value = "queryJson", required = false) String queryJson,
+                               HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = inspectorsxController.ytiotXjInspectorsService.appendInspectors(jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+
+    @RequestMapping(value = "/update", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView update(@RequestParam(value = "queryJson", required = false) String queryJson,
+                               HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = inspectorsxController.ytiotXjInspectorsService.updateInspectors(jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+
+    @RequestMapping(value = "/del", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView del(@RequestParam(value = "queryJson", required = false) String queryJson,
+                            HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = inspectorsxController.ytiotXjInspectorsService.deleteInspectors(jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/getTeamMembersList", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView getTeamMembersList(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                           @RequestParam(value = "page", required = false) String page,
+                                           @RequestParam(value = "start", required = false) String start,
+                                           @RequestParam(value = "limit", required = false) String limit,
+                                           @RequestParam(value = "sort", required = false) String sort,
+                                           HttpServletRequest request) {
+        // TODO Auto-generated constructor stub
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = inspectorsxController.ytiotXjInspectorsService.getTeamMembersList(jsonObject.toString(), page, start, limit, sort);
 //			System.out.println(ret);
-			mav.addObject("ret_str", ret);
-			
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	//巡检方法
-	@RequestMapping(value="/getTeamMembersListxj",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView  getTeamMembersListxj(@RequestParam(value = "queryJson", required = false) String queryJson,
-			@RequestParam(value = "page", required = false) String page,
-			@RequestParam(value = "start", required = false) String start,
-			@RequestParam(value = "limit", required = false) String limit,
-			@RequestParam(value = "sort", required = false) String sort) {
-		// TODO Auto-generated constructor stub
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  inspectorsxController.ytiotXjInspectorsService.getTeamMembersListxj(queryJson,page,start,limit,sort);
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    //巡检方法
+    @RequestMapping(value = "/getTeamMembersListxj", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView getTeamMembersListxj(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                             @RequestParam(value = "page", required = false) String page,
+                                             @RequestParam(value = "start", required = false) String start,
+                                             @RequestParam(value = "limit", required = false) String limit,
+                                             @RequestParam(value = "sort", required = false) String sort,
+                                             HttpServletRequest request) {
+        // TODO Auto-generated constructor stub
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = inspectorsxController.ytiotXjInspectorsService.getTeamMembersListxj(jsonObject.toString(), page, start, limit, sort);
 //			System.out.println(ret);
-			mav.addObject("ret_str", ret);
-			
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
-
-
-	@RequestMapping(value="/getTeamMembersList1",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView  getTeamMembersList1(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		// TODO Auto-generated constructor stub
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  inspectorsxController.ytiotXjInspectorsService.getTeamMembersList1(queryJson);
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+
+    @RequestMapping(value = "/getTeamMembersList1", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView getTeamMembersList1(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                            HttpServletRequest request) {
+        // TODO Auto-generated constructor stub
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = inspectorsxController.ytiotXjInspectorsService.getTeamMembersList1(jsonObject.toString());
 //			System.out.println(ret);
-			mav.addObject("ret_str", ret);
-			
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-	@RequestMapping(value="/getTeamMembersList1xj",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView  getTeamMembersList1xj(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		// TODO Auto-generated constructor stub
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  inspectorsxController.ytiotXjInspectorsService.getTeamMembersList1xj(queryJson);
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/getTeamMembersList1xj", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView getTeamMembersList1xj(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                              HttpServletRequest request) {
+        // TODO Auto-generated constructor stub
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = inspectorsxController.ytiotXjInspectorsService.getTeamMembersList1xj(jsonObject.toString());
 //			System.out.println(ret);
-			mav.addObject("ret_str", ret);
-			
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
 }

src/cn/com/usky/iot/controller/MaintenanceController.java

@@ -2,7 +2,14 @@ package cn.com.usky.iot.controller;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 
+import cn.com.usky.iot.auth.TokenAuthBO;
+import cn.com.usky.iot.auth.TokenAuthService;
+import cn.com.usky.iot.controller.login.Constants;
+import cn.com.usky.iot.entity.YtiotTAdmin;
+import cn.com.usky.utils.HttpServletRequestUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -27,18 +34,34 @@ public class MaintenanceController {
 		 maintenanceController.ytiotTMaintenanceService = this.ytiotTMaintenanceService;
 	 }
 
+	@Autowired
+	private TokenAuthService tokenAuthService;
+
 	@RequestMapping(value="/getList",method= {RequestMethod.GET,RequestMethod.POST})
 	public ModelAndView  getList(@RequestParam(value = "queryJson", required = false) String queryJson,
 			@RequestParam(value = "page", required = false) String page,
 			@RequestParam(value = "start", required = false) String start,
 			@RequestParam(value = "limit", required = false) String limit,
-			@RequestParam(value = "sort", required = false) String sort) {
+			@RequestParam(value = "sort", required = false) String sort,
+								 HttpServletRequest request) {
 		// TODO Auto-generated constructor stub
 		ModelAndView mav = new ModelAndView();
+		TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+		boolean isAuth = tokenAuthBO.isAuthState();
+		if (!isAuth) {
+			com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+			json.put("check", false);
+			json.put("errMsg", "权限错误，请重新登录");
+			mav.addObject("ret_str", json.toJSONString());
+		}
 		mav.setViewName("return");
-//		System.out.println(queryJson);
+		//通过获取用户信息
+		YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+		com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+		jsonObject.put("V_LOGINNAME", o.getVLoginname());
+		jsonObject.put("V_PASSWORD", o.getVPassword());
 		try {
-			String ret =  maintenanceController.ytiotTMaintenanceService.getMaintenanceList(queryJson,page,start,limit,sort);
+			String ret =  maintenanceController.ytiotTMaintenanceService.getMaintenanceList(jsonObject.toString(),page,start,limit,sort);
 //			System.out.println(ret);
 			mav.addObject("ret_str", ret);
 			
@@ -54,13 +77,26 @@ public class MaintenanceController {
 			@RequestParam(value = "page", required = false) String page,
 			@RequestParam(value = "start", required = false) String start,
 			@RequestParam(value = "limit", required = false) String limit,
-			@RequestParam(value = "sort", required = false) String sort) {
+			@RequestParam(value = "sort", required = false) String sort,
+								  HttpServletRequest request) {
 		// TODO Auto-generated constructor stub
 		ModelAndView mav = new ModelAndView();
+		TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+		boolean isAuth = tokenAuthBO.isAuthState();
+		if (!isAuth) {
+			com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+			json.put("check", false);
+			json.put("errMsg", "权限错误，请重新登录");
+			mav.addObject("ret_str", json.toJSONString());
+		}
 		mav.setViewName("return");
-//		System.out.println(queryJson);
+		//通过获取用户信息
+		YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+		com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+		jsonObject.put("V_LOGINNAME", o.getVLoginname());
+		jsonObject.put("V_PASSWORD", o.getVPassword());
 		try {
-			String ret =  maintenanceController.ytiotTMaintenanceService.getMaintenanceList1(queryJson,page,start,limit,sort);
+			String ret =  maintenanceController.ytiotTMaintenanceService.getMaintenanceList1(jsonObject.toString(),page,start,limit,sort);
 //			System.out.println(ret);
 			mav.addObject("ret_str", ret);
 			
@@ -92,12 +128,25 @@ public class MaintenanceController {
 //		return mav;
 //	}
 	@RequestMapping(value="/append",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView append(@RequestParam(value = "queryJson", required = false) String queryJson) {
+	public ModelAndView append(@RequestParam(value = "queryJson", required = false) String queryJson,
+							   HttpServletRequest request) {
 		ModelAndView mav = new ModelAndView();
+		TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+		boolean isAuth = tokenAuthBO.isAuthState();
+		if (!isAuth) {
+			com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+			json.put("check", false);
+			json.put("errMsg", "权限错误，请重新登录");
+			mav.addObject("ret_str", json.toJSONString());
+		}
 		mav.setViewName("return");
-//		System.out.println(queryJson);
+		//通过获取用户信息
+		YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+		com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+		jsonObject.put("V_LOGINNAME", o.getVLoginname());
+		jsonObject.put("V_PASSWORD", o.getVPassword());
 		try {
-			String ret =  maintenanceController.ytiotTMaintenanceService.appendMaintenance(queryJson);
+			String ret =  maintenanceController.ytiotTMaintenanceService.appendMaintenance(jsonObject.toString());
 			mav.addObject("ret_str",ret);
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -106,12 +155,25 @@ public class MaintenanceController {
 	}
 	
 	@RequestMapping(value="/append1",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView append1(@RequestParam(value = "queryJson", required = false) String queryJson) {
+	public ModelAndView append1(@RequestParam(value = "queryJson", required = false) String queryJson,
+								HttpServletRequest request) {
 		ModelAndView mav = new ModelAndView();
+		TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+		boolean isAuth = tokenAuthBO.isAuthState();
+		if (!isAuth) {
+			com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+			json.put("check", false);
+			json.put("errMsg", "权限错误，请重新登录");
+			mav.addObject("ret_str", json.toJSONString());
+		}
 		mav.setViewName("return");
-//		System.out.println(queryJson);
+		//通过获取用户信息
+		YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+		com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+		jsonObject.put("V_LOGINNAME", o.getVLoginname());
+		jsonObject.put("V_PASSWORD", o.getVPassword());
 		try {
-			String ret =  maintenanceController.ytiotTMaintenanceService.appendMaintenance1(queryJson);
+			String ret =  maintenanceController.ytiotTMaintenanceService.appendMaintenance1(jsonObject.toString());
 			mav.addObject("ret_str",ret);
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -119,12 +181,25 @@ public class MaintenanceController {
 		return mav;
 	}
 	@RequestMapping(value="/update",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView update(@RequestParam(value = "queryJson", required = false) String queryJson) {
+	public ModelAndView update(@RequestParam(value = "queryJson", required = false) String queryJson,
+							   HttpServletRequest request) {
 		ModelAndView mav = new ModelAndView();
+		TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+		boolean isAuth = tokenAuthBO.isAuthState();
+		if (!isAuth) {
+			com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+			json.put("check", false);
+			json.put("errMsg", "权限错误，请重新登录");
+			mav.addObject("ret_str", json.toJSONString());
+		}
 		mav.setViewName("return");
-//		System.out.println(queryJson);
+		//通过获取用户信息
+		YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+		com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+		jsonObject.put("V_LOGINNAME", o.getVLoginname());
+		jsonObject.put("V_PASSWORD", o.getVPassword());
 		try {
-			String ret =  maintenanceController.ytiotTMaintenanceService.updateMaintenance(queryJson);
+			String ret =  maintenanceController.ytiotTMaintenanceService.updateMaintenance(jsonObject.toString());
 			mav.addObject("ret_str",ret);
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -132,12 +207,25 @@ public class MaintenanceController {
 		return mav;
 	}
 	@RequestMapping(value="/update1",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView update1(@RequestParam(value = "queryJson", required = false) String queryJson) {
+	public ModelAndView update1(@RequestParam(value = "queryJson", required = false) String queryJson,
+								HttpServletRequest request) {
 		ModelAndView mav = new ModelAndView();
+		TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+		boolean isAuth = tokenAuthBO.isAuthState();
+		if (!isAuth) {
+			com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+			json.put("check", false);
+			json.put("errMsg", "权限错误，请重新登录");
+			mav.addObject("ret_str", json.toJSONString());
+		}
 		mav.setViewName("return");
-//		System.out.println(queryJson);
+		//通过获取用户信息
+		YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+		com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+		jsonObject.put("V_LOGINNAME", o.getVLoginname());
+		jsonObject.put("V_PASSWORD", o.getVPassword());
 		try {
-			String ret =  maintenanceController.ytiotTMaintenanceService.updateMaintenance1(queryJson);
+			String ret =  maintenanceController.ytiotTMaintenanceService.updateMaintenance1(jsonObject.toString());
 			mav.addObject("ret_str",ret);
 		} catch (Exception e) {
 			e.printStackTrace();

src/cn/com/usky/iot/controller/MaintenancePersonController.java

@@ -2,7 +2,14 @@ package cn.com.usky.iot.controller;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 
+import cn.com.usky.iot.auth.TokenAuthBO;
+import cn.com.usky.iot.auth.TokenAuthService;
+import cn.com.usky.iot.controller.login.Constants;
+import cn.com.usky.iot.entity.YtiotTAdmin;
+import cn.com.usky.utils.HttpServletRequestUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -15,61 +22,92 @@ import cn.com.usky.iot.maintenanceperson.service.YtiotTMaintenancePersonService;
 @RequestMapping("/iot/maintenanceperson")
 public class MaintenancePersonController {
 
-	@Resource
-	private YtiotTMaintenancePersonService ytiotTMaintenancePersonService;
-	
-	private static MaintenancePersonController maintenancepersonController;
-	
-	
-	 @PostConstruct
-	 public void init() {
-		 maintenancepersonController = this;
-		 maintenancepersonController.ytiotTMaintenancePersonService = this.ytiotTMaintenancePersonService;
-	 }
-
-	@RequestMapping(value="/getList",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView  getList(@RequestParam(value = "queryJson", required = false) String queryJson,
-			@RequestParam(value = "page", required = false) String page,
-			@RequestParam(value = "start", required = false) String start,
-			@RequestParam(value = "limit", required = false) String limit,
-			@RequestParam(value = "sort", required = false) String sort) {
-		// TODO Auto-generated constructor stub
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  maintenancepersonController.ytiotTMaintenancePersonService.getMaintenancePersonList(queryJson,page,start,limit,sort);
+    @Resource
+    private YtiotTMaintenancePersonService ytiotTMaintenancePersonService;
+
+    private static MaintenancePersonController maintenancepersonController;
+
+
+    @PostConstruct
+    public void init() {
+        maintenancepersonController = this;
+        maintenancepersonController.ytiotTMaintenancePersonService = this.ytiotTMaintenancePersonService;
+    }
+
+    @Autowired
+    private TokenAuthService tokenAuthService;
+
+    @RequestMapping(value = "/getList", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView getList(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                @RequestParam(value = "page", required = false) String page,
+                                @RequestParam(value = "start", required = false) String start,
+                                @RequestParam(value = "limit", required = false) String limit,
+                                @RequestParam(value = "sort", required = false) String sort,
+                                HttpServletRequest request) {
+        // TODO Auto-generated constructor stub
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = maintenancepersonController.ytiotTMaintenancePersonService.getMaintenancePersonList(jsonObject.toString(), page, start, limit, sort);
 //			System.out.println(ret);
-			mav.addObject("ret_str", ret);
-			
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	@RequestMapping(value="/getList1",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView  getList1(@RequestParam(value = "queryJson", required = false) String queryJson,
-			@RequestParam(value = "page", required = false) String page,
-			@RequestParam(value = "start", required = false) String start,
-			@RequestParam(value = "limit", required = false) String limit,
-			@RequestParam(value = "sort", required = false) String sort) {
-		// TODO Auto-generated constructor stub
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  maintenancepersonController.ytiotTMaintenancePersonService.getMaintenancePersonList1(queryJson,page,start,limit,sort);
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/getList1", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView getList1(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                 @RequestParam(value = "page", required = false) String page,
+                                 @RequestParam(value = "start", required = false) String start,
+                                 @RequestParam(value = "limit", required = false) String limit,
+                                 @RequestParam(value = "sort", required = false) String sort,
+                                 HttpServletRequest request) {
+        // TODO Auto-generated constructor stub
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = maintenancepersonController.ytiotTMaintenancePersonService.getMaintenancePersonList1(jsonObject.toString(), page, start, limit, sort);
 //			System.out.println(ret);
-			mav.addObject("ret_str", ret);
-			
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
-//	@RequestMapping(value="/getVerList",method= {RequestMethod.GET,RequestMethod.POST})
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    //	@RequestMapping(value="/getVerList",method= {RequestMethod.GET,RequestMethod.POST})
 //	public ModelAndView  getVerList(@RequestParam(value = "queryJson", required = false) String queryJson,
 //			@RequestParam(value = "page", required = false) String page,
 //			@RequestParam(value = "start", required = false) String start,
@@ -90,59 +128,114 @@ public class MaintenancePersonController {
 //		}
 //		return mav;
 //	}
-	@RequestMapping(value="/append",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView append(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  maintenancepersonController.ytiotTMaintenancePersonService.appendMaintenancePerson(queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	@RequestMapping(value="/append1",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView append1(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  maintenancepersonController.ytiotTMaintenancePersonService.appendMaintenancePerson1(queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	@RequestMapping(value="/update",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView update(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  maintenancepersonController.ytiotTMaintenancePersonService.updateMaintenancePerson(queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	@RequestMapping(value="/update1",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView update1(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  maintenancepersonController.ytiotTMaintenancePersonService.updateMaintenancePerson1(queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	//注销
+    @RequestMapping(value = "/append", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView append(@RequestParam(value = "queryJson", required = false) String queryJson,
+                               HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = maintenancepersonController.ytiotTMaintenancePersonService.appendMaintenancePerson(jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/append1", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView append1(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = maintenancepersonController.ytiotTMaintenancePersonService.appendMaintenancePerson1(jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/update", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView update(@RequestParam(value = "queryJson", required = false) String queryJson,
+                               HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = maintenancepersonController.ytiotTMaintenancePersonService.updateMaintenancePerson(jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/update1", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView update1(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = maintenancepersonController.ytiotTMaintenancePersonService.updateMaintenancePerson1(jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+    //注销
 //	@RequestMapping(value="/del",method= {RequestMethod.GET,RequestMethod.POST})
 //	public ModelAndView del(@RequestParam(value = "queryJson", required = false) String queryJson) {
 //		ModelAndView mav = new ModelAndView();
@@ -156,8 +249,8 @@ public class MaintenancePersonController {
 //		}
 //		return mav;
 //	}
-	
-	//导出
+
+    //导出
 //	@RequestMapping(value="/exl",method= {RequestMethod.GET,RequestMethod.POST})
 //	public ModelAndView exl(@RequestParam(value = "queryJson", required = false) String queryJson) {
 //		ModelAndView mav = new ModelAndView();

src/cn/com/usky/iot/controller/MaintenancePlanViewController.java

@@ -1,54 +1,77 @@
 package cn.com.usky.iot.controller;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.Resource;
-
+import cn.com.usky.iot.auth.TokenAuthBO;
+import cn.com.usky.iot.auth.TokenAuthService;
+import cn.com.usky.iot.controller.login.Constants;
+import cn.com.usky.iot.entity.YtiotTAdmin;
+import cn.com.usky.iot.maintenanceplan.service.YtiotTMaintenancePlanService;
+import cn.com.usky.utils.HttpServletRequestUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.servlet.ModelAndView;
 
-import cn.com.usky.iot.maintenanceplan.service.YtiotTMaintenancePlanService;
+import javax.annotation.PostConstruct;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 
 @Controller
 @RequestMapping("/iot/maintenanceplan/view")
 public class MaintenancePlanViewController {
 
-	@Resource
-	private YtiotTMaintenancePlanService ytiotTMaintenancePlanService;
-	
-	private static MaintenancePlanViewController maintenanceplanviewController;
-	
-	
-	 @PostConstruct
-	 public void init() {
-		 maintenanceplanviewController = this;
-		 maintenanceplanviewController.ytiotTMaintenancePlanService = this.ytiotTMaintenancePlanService;
-	 }
+    @Resource
+    private YtiotTMaintenancePlanService ytiotTMaintenancePlanService;
+
+    private static MaintenancePlanViewController maintenanceplanviewController;
 
-	@RequestMapping(value="/getList",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView  getList(@RequestParam(value = "queryJson", required = false) String queryJson,
-			@RequestParam(value = "page", required = false) String page,
-			@RequestParam(value = "start", required = false) String start,
-			@RequestParam(value = "limit", required = false) String limit,
-			@RequestParam(value = "sort", required = false) String sort) {
-		// TODO Auto-generated constructor stub
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  maintenanceplanviewController.ytiotTMaintenancePlanService.getMaintenancePlanList(queryJson,page,start,limit,sort);
+
+    @PostConstruct
+    public void init() {
+        maintenanceplanviewController = this;
+        maintenanceplanviewController.ytiotTMaintenancePlanService = this.ytiotTMaintenancePlanService;
+    }
+
+    @Autowired
+    private TokenAuthService tokenAuthService;
+
+    @RequestMapping(value = "/getList", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView getList(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                @RequestParam(value = "page", required = false) String page,
+                                @RequestParam(value = "start", required = false) String start,
+                                @RequestParam(value = "limit", required = false) String limit,
+                                @RequestParam(value = "sort", required = false) String sort,
+                                HttpServletRequest request) {
+        // TODO Auto-generated constructor stub
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = maintenanceplanviewController.ytiotTMaintenancePlanService.getMaintenancePlanList(jsonObject.toString(), page, start, limit, sort);
 //			System.out.println(ret);
-			mav.addObject("ret_str", ret);
-			
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
-//	@RequestMapping(value="/getVerList",method= {RequestMethod.GET,RequestMethod.POST})
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    //	@RequestMapping(value="/getVerList",method= {RequestMethod.GET,RequestMethod.POST})
 //	public ModelAndView  getVerList(@RequestParam(value = "queryJson", required = false) String queryJson,
 //			@RequestParam(value = "page", required = false) String page,
 //			@RequestParam(value = "start", required = false) String start,
@@ -69,33 +92,60 @@ public class MaintenancePlanViewController {
 //		}
 //		return mav;
 //	}
-	@RequestMapping(value="/append",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView append(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  maintenanceplanviewController.ytiotTMaintenancePlanService.appendMaintenancePlan(queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	@RequestMapping(value="/update",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView update(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  maintenanceplanviewController.ytiotTMaintenancePlanService.updateMaintenancePlan(queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	//注销
+    @RequestMapping(value = "/append", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView append(@RequestParam(value = "queryJson", required = false) String queryJson,
+                               HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = maintenanceplanviewController.ytiotTMaintenancePlanService.appendMaintenancePlan(jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/update", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView update(@RequestParam(value = "queryJson", required = false) String queryJson,
+                               HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = maintenanceplanviewController.ytiotTMaintenancePlanService.updateMaintenancePlan(jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+    //注销
 //	@RequestMapping(value="/del",method= {RequestMethod.GET,RequestMethod.POST})
 //	public ModelAndView del(@RequestParam(value = "queryJson", required = false) String queryJson) {
 //		ModelAndView mav = new ModelAndView();
@@ -109,8 +159,8 @@ public class MaintenancePlanViewController {
 //		}
 //		return mav;
 //	}
-	
-	//导出
+
+    //导出
 //	@RequestMapping(value="/exl",method= {RequestMethod.GET,RequestMethod.POST})
 //	public ModelAndView exl(@RequestParam(value = "queryJson", required = false) String queryJson) {
 //		ModelAndView mav = new ModelAndView();

src/cn/com/usky/iot/controller/MaintenanceRecordController.java

@@ -2,7 +2,14 @@ package cn.com.usky.iot.controller;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 
+import cn.com.usky.iot.auth.TokenAuthBO;
+import cn.com.usky.iot.auth.TokenAuthService;
+import cn.com.usky.iot.controller.login.Constants;
+import cn.com.usky.iot.entity.YtiotTAdmin;
+import cn.com.usky.utils.HttpServletRequestUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -15,60 +22,90 @@ import cn.com.usky.iot.maintenancerecord.service.YtiotTMaintenanceRecordService;
 @RequestMapping("/iot/maintenancerecord")
 public class MaintenanceRecordController {
 
-	@Resource
-	private YtiotTMaintenanceRecordService ytiotTMaintenanceRecordService;
-	
-	private static MaintenanceRecordController maintenancerecordController;
-	
-	
-	 @PostConstruct
-	 public void init() {
-		 maintenancerecordController = this;
-		 maintenancerecordController.ytiotTMaintenanceRecordService = this.ytiotTMaintenanceRecordService;
-	 }
+    @Resource
+    private YtiotTMaintenanceRecordService ytiotTMaintenanceRecordService;
 
-	@RequestMapping(value="/getList",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView  getList(@RequestParam(value = "queryJson", required = false) String queryJson,
-			@RequestParam(value = "page", required = false) String page,
-			@RequestParam(value = "start", required = false) String start,
-			@RequestParam(value = "limit", required = false) String limit,
-			@RequestParam(value = "sort", required = false) String sort) {
-		// TODO Auto-generated constructor stub
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  maintenancerecordController.ytiotTMaintenanceRecordService.getMaintenanceRecordList(queryJson,page,start,limit,sort);
+    private static MaintenanceRecordController maintenancerecordController;
+
+
+    @PostConstruct
+    public void init() {
+        maintenancerecordController = this;
+        maintenancerecordController.ytiotTMaintenanceRecordService = this.ytiotTMaintenanceRecordService;
+    }
+
+    @Autowired
+    private TokenAuthService tokenAuthService;
+
+    @RequestMapping(value = "/getList", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView getList(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                @RequestParam(value = "page", required = false) String page,
+                                @RequestParam(value = "start", required = false) String start,
+                                @RequestParam(value = "limit", required = false) String limit,
+                                @RequestParam(value = "sort", required = false) String sort,
+                                HttpServletRequest request) {
+        // TODO Auto-generated constructor stub
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = maintenancerecordController.ytiotTMaintenanceRecordService.getMaintenanceRecordList(jsonObject.toString(), page, start, limit, sort);
 //			System.out.println(ret);
-			mav.addObject("ret_str", ret);
-			
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	@RequestMapping(value="/getList1",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView  getList1(@RequestParam(value = "queryJson", required = false) String queryJson,
-			@RequestParam(value = "page", required = false) String page,
-			@RequestParam(value = "start", required = false) String start,
-			@RequestParam(value = "limit", required = false) String limit,
-			@RequestParam(value = "sort", required = false) String sort) {
-		// TODO Auto-generated constructor stub
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  maintenancerecordController.ytiotTMaintenanceRecordService.getMaintenanceRecordList1(queryJson,page,start,limit,sort);
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/getList1", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView getList1(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                 @RequestParam(value = "page", required = false) String page,
+                                 @RequestParam(value = "start", required = false) String start,
+                                 @RequestParam(value = "limit", required = false) String limit,
+                                 @RequestParam(value = "sort", required = false) String sort,
+                                 HttpServletRequest request) {
+        // TODO Auto-generated constructor stub
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = maintenancerecordController.ytiotTMaintenanceRecordService.getMaintenanceRecordList1(jsonObject.toString(), page, start, limit, sort);
 //			System.out.println(ret);
-			mav.addObject("ret_str", ret);
-			
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
 
 }

src/cn/com/usky/iot/controller/OutcryPackageController.java

@@ -2,7 +2,14 @@ package cn.com.usky.iot.controller;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 
+import cn.com.usky.iot.auth.TokenAuthBO;
+import cn.com.usky.iot.auth.TokenAuthService;
+import cn.com.usky.iot.controller.login.Constants;
+import cn.com.usky.iot.entity.YtiotTAdmin;
+import cn.com.usky.utils.HttpServletRequestUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -15,40 +22,57 @@ import cn.com.usky.iot.outcrypackage.service.YtiotTOutcryPackageService;
 @RequestMapping("/iot/outcrypackage")
 public class OutcryPackageController {
 
-	@Resource
-	private YtiotTOutcryPackageService ytiotTOutcryPackageService;
-	
-	private static OutcryPackageController outcrypackageController;
-	
-	
-	 @PostConstruct
-	 public void init() {
-		 outcrypackageController = this;
-		 outcrypackageController.ytiotTOutcryPackageService = this.ytiotTOutcryPackageService;
-	 }
+    @Resource
+    private YtiotTOutcryPackageService ytiotTOutcryPackageService;
 
-	@RequestMapping(value="/getList",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView  getList(@RequestParam(value = "queryJson", required = false) String queryJson,
-			@RequestParam(value = "page", required = false) String page,
-			@RequestParam(value = "start", required = false) String start,
-			@RequestParam(value = "limit", required = false) String limit,
-			@RequestParam(value = "sort", required = false) String sort) {
-		// TODO Auto-generated constructor stub
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret = outcrypackageController.ytiotTOutcryPackageService.getOutcryPackageList(queryJson,page,start,limit,sort);
+    private static OutcryPackageController outcrypackageController;
+
+
+    @PostConstruct
+    public void init() {
+        outcrypackageController = this;
+        outcrypackageController.ytiotTOutcryPackageService = this.ytiotTOutcryPackageService;
+    }
+
+    @Autowired
+    private TokenAuthService tokenAuthService;
+
+    @RequestMapping(value = "/getList", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView getList(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                @RequestParam(value = "page", required = false) String page,
+                                @RequestParam(value = "start", required = false) String start,
+                                @RequestParam(value = "limit", required = false) String limit,
+                                @RequestParam(value = "sort", required = false) String sort,
+                                HttpServletRequest request) {
+        // TODO Auto-generated constructor stub
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = outcrypackageController.ytiotTOutcryPackageService.getOutcryPackageList(jsonObject.toString(), page, start, limit, sort);
 //			System.out.println(ret);
-			mav.addObject("ret_str", ret);
-			
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
-//	@RequestMapping(value="/getVerList",method= {RequestMethod.GET,RequestMethod.POST})
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    //	@RequestMapping(value="/getVerList",method= {RequestMethod.GET,RequestMethod.POST})
 //	public ModelAndView  getVerList(@RequestParam(value = "queryJson", required = false) String queryJson,
 //			@RequestParam(value = "page", required = false) String page,
 //			@RequestParam(value = "start", required = false) String start,
@@ -69,45 +93,86 @@ public class OutcryPackageController {
 //		}
 //		return mav;
 //	}
-	@RequestMapping(value="/append",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView append(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =outcrypackageController.ytiotTOutcryPackageService.appendOutcryPackage(queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	@RequestMapping(value="/update",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView update(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret = outcrypackageController.ytiotTOutcryPackageService.updateOutcryPackage(queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	//注销
-	@RequestMapping(value="/del",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView del(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret = outcrypackageController.ytiotTOutcryPackageService.deleteOutcryPackage(queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
+    @RequestMapping(value = "/append", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView append(@RequestParam(value = "queryJson", required = false) String queryJson,
+                               HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = outcrypackageController.ytiotTOutcryPackageService.appendOutcryPackage(jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/update", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView update(@RequestParam(value = "queryJson", required = false) String queryJson,
+                               HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = outcrypackageController.ytiotTOutcryPackageService.updateOutcryPackage(jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    //注销
+    @RequestMapping(value = "/del", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView del(@RequestParam(value = "queryJson", required = false) String queryJson,
+                            HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = outcrypackageController.ytiotTOutcryPackageService.deleteOutcryPackage(jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
 
 }

src/cn/com/usky/iot/controller/PatrolPlanController.java

@@ -2,7 +2,14 @@ package cn.com.usky.iot.controller;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 
+import cn.com.usky.iot.auth.TokenAuthBO;
+import cn.com.usky.iot.auth.TokenAuthService;
+import cn.com.usky.iot.controller.login.Constants;
+import cn.com.usky.iot.entity.YtiotTAdmin;
+import cn.com.usky.utils.HttpServletRequestUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -15,40 +22,57 @@ import cn.com.usky.iot.patrolplan.service.YtiotTPatrolPlanService;
 @RequestMapping("/iot/patrolplan")
 public class PatrolPlanController {
 
-	@Resource
-	private YtiotTPatrolPlanService ytiotTPatrolPlanService;
-	
-	private static PatrolPlanController patrolplanController;
-	
-	
-	 @PostConstruct
-	 public void init() {
-		 patrolplanController = this;
-		 patrolplanController.ytiotTPatrolPlanService = this.ytiotTPatrolPlanService;
-	 }
-
-	@RequestMapping(value="/getList",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView  getList(@RequestParam(value = "queryJson", required = false) String queryJson,
-			@RequestParam(value = "page", required = false) String page,
-			@RequestParam(value = "start", required = false) String start,
-			@RequestParam(value = "limit", required = false) String limit,
-			@RequestParam(value = "sort", required = false) String sort) {
-		// TODO Auto-generated constructor stub
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  patrolplanController.ytiotTPatrolPlanService.getPatrolPlanList(queryJson,page,start,limit,sort);
+    @Resource
+    private YtiotTPatrolPlanService ytiotTPatrolPlanService;
+
+    private static PatrolPlanController patrolplanController;
+
+
+    @PostConstruct
+    public void init() {
+        patrolplanController = this;
+        patrolplanController.ytiotTPatrolPlanService = this.ytiotTPatrolPlanService;
+    }
+
+    @Autowired
+    private TokenAuthService tokenAuthService;
+
+    @RequestMapping(value = "/getList", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView getList(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                @RequestParam(value = "page", required = false) String page,
+                                @RequestParam(value = "start", required = false) String start,
+                                @RequestParam(value = "limit", required = false) String limit,
+                                @RequestParam(value = "sort", required = false) String sort,
+                                HttpServletRequest request) {
+        // TODO Auto-generated constructor stub
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = patrolplanController.ytiotTPatrolPlanService.getPatrolPlanList(jsonObject.toString(), page, start, limit, sort);
 //			System.out.println(ret);
-			mav.addObject("ret_str", ret);
-			
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
-//	@RequestMapping(value="/getVerList",method= {RequestMethod.GET,RequestMethod.POST})
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    //	@RequestMapping(value="/getVerList",method= {RequestMethod.GET,RequestMethod.POST})
 //	public ModelAndView  getVerList(@RequestParam(value = "queryJson", required = false) String queryJson,
 //			@RequestParam(value = "page", required = false) String page,
 //			@RequestParam(value = "start", required = false) String start,
@@ -69,33 +93,60 @@ public class PatrolPlanController {
 //		}
 //		return mav;
 //	}
-	@RequestMapping(value="/append",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView append(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  patrolplanController.ytiotTPatrolPlanService.appendPatrolPlan(queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	@RequestMapping(value="/update",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView update(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  patrolplanController.ytiotTPatrolPlanService.updatePatrolPlan(queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	//注销
+    @RequestMapping(value = "/append", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView append(@RequestParam(value = "queryJson", required = false) String queryJson,
+                               HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = patrolplanController.ytiotTPatrolPlanService.appendPatrolPlan(jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/update", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView update(@RequestParam(value = "queryJson", required = false) String queryJson,
+                               HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = patrolplanController.ytiotTPatrolPlanService.updatePatrolPlan(jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+    //注销
 //	@RequestMapping(value="/del",method= {RequestMethod.GET,RequestMethod.POST})
 //	public ModelAndView del(@RequestParam(value = "queryJson", required = false) String queryJson) {
 //		ModelAndView mav = new ModelAndView();
@@ -109,8 +160,8 @@ public class PatrolPlanController {
 //		}
 //		return mav;
 //	}
-	
-	//导出
+
+    //导出
 //	@RequestMapping(value="/exl",method= {RequestMethod.GET,RequestMethod.POST})
 //	public ModelAndView exl(@RequestParam(value = "queryJson", required = false) String queryJson) {
 //		ModelAndView mav = new ModelAndView();
@@ -125,54 +176,93 @@ public class PatrolPlanController {
 //		return mav;
 //	}
 
-	@RequestMapping(value="/getControlList",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView  getControlList(@RequestParam(value = "queryJson", required = false) String queryJson,
-			@RequestParam(value = "page", required = false) String page,
-			@RequestParam(value = "start", required = false) String start,
-			@RequestParam(value = "limit", required = false) String limit,
-			@RequestParam(value = "sort", required = false) String sort) {
-		// TODO Auto-generated constructor stub
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  patrolplanController.ytiotTPatrolPlanService.getControlroomList(queryJson,page,start,limit,sort);
+    @RequestMapping(value = "/getControlList", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView getControlList(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                       @RequestParam(value = "page", required = false) String page,
+                                       @RequestParam(value = "start", required = false) String start,
+                                       @RequestParam(value = "limit", required = false) String limit,
+                                       @RequestParam(value = "sort", required = false) String sort,
+                                       HttpServletRequest request) {
+        // TODO Auto-generated constructor stub
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = patrolplanController.ytiotTPatrolPlanService.getControlroomList(jsonObject.toString(), page, start, limit, sort);
 //			System.out.println(ret);
-			mav.addObject("ret_str", ret);
-			
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-	@RequestMapping(value="/appendControl",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView appendControl(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  patrolplanController.ytiotTPatrolPlanService.appendControlRoom(queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-	@RequestMapping(value="/updateControl",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView updateControl(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  patrolplanController.ytiotTPatrolPlanService.updateControlRoom(queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/appendControl", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView appendControl(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                      HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = patrolplanController.ytiotTPatrolPlanService.appendControlRoom(jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/updateControl", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView updateControl(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                      HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = patrolplanController.ytiotTPatrolPlanService.updateControlRoom(jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
 }

src/cn/com/usky/iot/controller/PatrolPlanViewController.java

@@ -2,7 +2,14 @@ package cn.com.usky.iot.controller;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 
+import cn.com.usky.iot.auth.TokenAuthBO;
+import cn.com.usky.iot.auth.TokenAuthService;
+import cn.com.usky.iot.controller.login.Constants;
+import cn.com.usky.iot.entity.YtiotTAdmin;
+import cn.com.usky.utils.HttpServletRequestUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -15,40 +22,57 @@ import cn.com.usky.iot.patrolplan.service.YtiotTPatrolPlanService;
 @RequestMapping("/iot/patrolplan/view")
 public class PatrolPlanViewController {
 
-	@Resource
-	private YtiotTPatrolPlanService ytiotTPatrolPlanService;
-	
-	private static PatrolPlanViewController patrolplanviewController;
-	
-	
-	 @PostConstruct
-	 public void init() {
-		 patrolplanviewController = this;
-		 patrolplanviewController.ytiotTPatrolPlanService = this.ytiotTPatrolPlanService;
-	 }
+    @Resource
+    private YtiotTPatrolPlanService ytiotTPatrolPlanService;
 
-	@RequestMapping(value="/getList",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView  getList(@RequestParam(value = "queryJson", required = false) String queryJson,
-			@RequestParam(value = "page", required = false) String page,
-			@RequestParam(value = "start", required = false) String start,
-			@RequestParam(value = "limit", required = false) String limit,
-			@RequestParam(value = "sort", required = false) String sort) {
-		// TODO Auto-generated constructor stub
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  patrolplanviewController.ytiotTPatrolPlanService.getPatrolPlanList(queryJson,page,start,limit,sort);
+    private static PatrolPlanViewController patrolplanviewController;
+
+
+    @PostConstruct
+    public void init() {
+        patrolplanviewController = this;
+        patrolplanviewController.ytiotTPatrolPlanService = this.ytiotTPatrolPlanService;
+    }
+
+    @Autowired
+    private TokenAuthService tokenAuthService;
+
+    @RequestMapping(value = "/getList", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView getList(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                @RequestParam(value = "page", required = false) String page,
+                                @RequestParam(value = "start", required = false) String start,
+                                @RequestParam(value = "limit", required = false) String limit,
+                                @RequestParam(value = "sort", required = false) String sort,
+                                HttpServletRequest request) {
+        // TODO Auto-generated constructor stub
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = patrolplanviewController.ytiotTPatrolPlanService.getPatrolPlanList(jsonObject.toString(), page, start, limit, sort);
 //			System.out.println(ret);
-			mav.addObject("ret_str", ret);
-			
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
-//	@RequestMapping(value="/getVerList",method= {RequestMethod.GET,RequestMethod.POST})
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    //	@RequestMapping(value="/getVerList",method= {RequestMethod.GET,RequestMethod.POST})
 //	public ModelAndView  getVerList(@RequestParam(value = "queryJson", required = false) String queryJson,
 //			@RequestParam(value = "page", required = false) String page,
 //			@RequestParam(value = "start", required = false) String start,
@@ -69,33 +93,60 @@ public class PatrolPlanViewController {
 //		}
 //		return mav;
 //	}
-	@RequestMapping(value="/append",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView append(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  patrolplanviewController.ytiotTPatrolPlanService.appendPatrolPlan(queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	@RequestMapping(value="/update",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView update(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  patrolplanviewController.ytiotTPatrolPlanService.updatePatrolPlan(queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	//注销
+    @RequestMapping(value = "/append", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView append(@RequestParam(value = "queryJson", required = false) String queryJson,
+                               HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = patrolplanviewController.ytiotTPatrolPlanService.appendPatrolPlan(jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/update", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView update(@RequestParam(value = "queryJson", required = false) String queryJson,
+                               HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = patrolplanviewController.ytiotTPatrolPlanService.updatePatrolPlan(jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+    //注销
 //	@RequestMapping(value="/del",method= {RequestMethod.GET,RequestMethod.POST})
 //	public ModelAndView del(@RequestParam(value = "queryJson", required = false) String queryJson) {
 //		ModelAndView mav = new ModelAndView();
@@ -109,8 +160,8 @@ public class PatrolPlanViewController {
 //		}
 //		return mav;
 //	}
-	
-	//导出
+
+    //导出
 //	@RequestMapping(value="/exl",method= {RequestMethod.GET,RequestMethod.POST})
 //	public ModelAndView exl(@RequestParam(value = "queryJson", required = false) String queryJson) {
 //		ModelAndView mav = new ModelAndView();

src/cn/com/usky/iot/controller/PatrolPointController.java

@@ -2,7 +2,14 @@ package cn.com.usky.iot.controller;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 
+import cn.com.usky.iot.auth.TokenAuthBO;
+import cn.com.usky.iot.auth.TokenAuthService;
+import cn.com.usky.iot.controller.login.Constants;
+import cn.com.usky.iot.entity.YtiotTAdmin;
+import cn.com.usky.utils.HttpServletRequestUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -15,62 +22,92 @@ import cn.com.usky.iot.patrolpoint.service.YtiotTPatrolPointService;
 @RequestMapping("/iot/patrolpoint")
 public class PatrolPointController {
 
-	@Resource
-	private YtiotTPatrolPointService ytiotTPatrolPointService;
-	
-	private static PatrolPointController patrolpointController;
-	
-	
-	 @PostConstruct
-	 public void init() {
-		 patrolpointController = this;
-		 patrolpointController.ytiotTPatrolPointService = this.ytiotTPatrolPointService;
-	 }
-
-	@RequestMapping(value="/getList",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView  getList(@RequestParam(value = "queryJson", required = false) String queryJson,
-			@RequestParam(value = "page", required = false) String page,
-			@RequestParam(value = "start", required = false) String start,
-			@RequestParam(value = "limit", required = false) String limit,
-			@RequestParam(value = "sort", required = false) String sort) {
-		// TODO Auto-generated constructor stub
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  patrolpointController.ytiotTPatrolPointService.getPatrolPointList(queryJson,page,start,limit,sort);
+    @Resource
+    private YtiotTPatrolPointService ytiotTPatrolPointService;
+
+    private static PatrolPointController patrolpointController;
+
+
+    @PostConstruct
+    public void init() {
+        patrolpointController = this;
+        patrolpointController.ytiotTPatrolPointService = this.ytiotTPatrolPointService;
+    }
+
+    @Autowired
+    private TokenAuthService tokenAuthService;
+
+    @RequestMapping(value = "/getList", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView getList(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                @RequestParam(value = "page", required = false) String page,
+                                @RequestParam(value = "start", required = false) String start,
+                                @RequestParam(value = "limit", required = false) String limit,
+                                @RequestParam(value = "sort", required = false) String sort,
+                                HttpServletRequest request) {
+        // TODO Auto-generated constructor stub
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = patrolpointController.ytiotTPatrolPointService.getPatrolPointList(jsonObject.toString(), page, start, limit, sort);
 //			System.out.println(ret);
-			mav.addObject("ret_str", ret);
-			
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-	@RequestMapping(value="/getList1",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView  getList1(@RequestParam(value = "queryJson", required = false) String queryJson,
-			@RequestParam(value = "page", required = false) String page,
-			@RequestParam(value = "start", required = false) String start,
-			@RequestParam(value = "limit", required = false) String limit,
-			@RequestParam(value = "sort", required = false) String sort) {
-		// TODO Auto-generated constructor stub
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  patrolpointController.ytiotTPatrolPointService.getPatrolPointList1(queryJson,page,start,limit,sort);
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/getList1", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView getList1(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                 @RequestParam(value = "page", required = false) String page,
+                                 @RequestParam(value = "start", required = false) String start,
+                                 @RequestParam(value = "limit", required = false) String limit,
+                                 @RequestParam(value = "sort", required = false) String sort,
+                                 HttpServletRequest request) {
+        // TODO Auto-generated constructor stub
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = patrolpointController.ytiotTPatrolPointService.getPatrolPointList1(jsonObject.toString(), page, start, limit, sort);
 //			System.out.println(ret);
-			mav.addObject("ret_str", ret);
-			
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
-//	@RequestMapping(value="/getVerList",method= {RequestMethod.GET,RequestMethod.POST})
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    //	@RequestMapping(value="/getVerList",method= {RequestMethod.GET,RequestMethod.POST})
 //	public ModelAndView  getVerList(@RequestParam(value = "queryJson", required = false) String queryJson,
 //			@RequestParam(value = "page", required = false) String page,
 //			@RequestParam(value = "start", required = false) String start,
@@ -91,60 +128,114 @@ public class PatrolPointController {
 //		}
 //		return mav;
 //	}
-	@RequestMapping(value="/append",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView append(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  patrolpointController.ytiotTPatrolPointService.appendPatrolPoint(queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-	@RequestMapping(value="/append1",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView append1(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  patrolpointController.ytiotTPatrolPointService.appendPatrolPoint1(queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	@RequestMapping(value="/update",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView update(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  patrolpointController.ytiotTPatrolPointService.updatePatrolPoint(queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	@RequestMapping(value="/update1",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView update1(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  patrolpointController.ytiotTPatrolPointService.updatePatrolPoint1(queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	//注销
+    @RequestMapping(value = "/append", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView append(@RequestParam(value = "queryJson", required = false) String queryJson,
+                               HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = patrolpointController.ytiotTPatrolPointService.appendPatrolPoint(jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/append1", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView append1(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = patrolpointController.ytiotTPatrolPointService.appendPatrolPoint1(jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/update", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView update(@RequestParam(value = "queryJson", required = false) String queryJson,
+                               HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = patrolpointController.ytiotTPatrolPointService.updatePatrolPoint(jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/update1", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView update1(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = patrolpointController.ytiotTPatrolPointService.updatePatrolPoint1(jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+    //注销
 //	@RequestMapping(value="/del",method= {RequestMethod.GET,RequestMethod.POST})
 //	public ModelAndView del(@RequestParam(value = "queryJson", required = false) String queryJson) {
 //		ModelAndView mav = new ModelAndView();
@@ -158,8 +249,8 @@ public class PatrolPointController {
 //		}
 //		return mav;
 //	}
-	
-	//导出
+
+    //导出
 //	@RequestMapping(value="/exl",method= {RequestMethod.GET,RequestMethod.POST})
 //	public ModelAndView exl(@RequestParam(value = "queryJson", required = false) String queryJson) {
 //		ModelAndView mav = new ModelAndView();

src/cn/com/usky/iot/controller/PlanMasterController.java

@@ -2,7 +2,14 @@ package cn.com.usky.iot.controller;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 
+import cn.com.usky.iot.auth.TokenAuthBO;
+import cn.com.usky.iot.auth.TokenAuthService;
+import cn.com.usky.iot.controller.login.Constants;
+import cn.com.usky.iot.entity.YtiotTAdmin;
+import cn.com.usky.utils.HttpServletRequestUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -15,125 +22,206 @@ import cn.com.usky.iot.xjplanmaster.service.YtiotXjPlanMasterService;
 @RequestMapping("/iot/planmaster")
 public class PlanMasterController {
 
-	@Resource
-	private YtiotXjPlanMasterService ytiotXjPlanMasterService;
-	
-	private static PlanMasterController planmasterController;
-	
-	
-	 @PostConstruct
-	 public void init() {
-		 planmasterController = this;
-		 planmasterController.ytiotXjPlanMasterService = this.ytiotXjPlanMasterService;
-	 }
-
-	@RequestMapping(value="/getList",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView  getList(@RequestParam(value = "queryJson", required = false) String queryJson,
-			@RequestParam(value = "page", required = false) String page,
-			@RequestParam(value = "start", required = false) String start,
-			@RequestParam(value = "limit", required = false) String limit,
-			@RequestParam(value = "sort", required = false) String sort) {
-		// TODO Auto-generated constructor stub
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  planmasterController.ytiotXjPlanMasterService.getPlanMasterList(queryJson,page,start,limit,sort);
+    @Resource
+    private YtiotXjPlanMasterService ytiotXjPlanMasterService;
+
+    private static PlanMasterController planmasterController;
+
+
+    @PostConstruct
+    public void init() {
+        planmasterController = this;
+        planmasterController.ytiotXjPlanMasterService = this.ytiotXjPlanMasterService;
+    }
+
+    @Autowired
+    private TokenAuthService tokenAuthService;
+
+    @RequestMapping(value = "/getList", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView getList(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                @RequestParam(value = "page", required = false) String page,
+                                @RequestParam(value = "start", required = false) String start,
+                                @RequestParam(value = "limit", required = false) String limit,
+                                @RequestParam(value = "sort", required = false) String sort,
+                                HttpServletRequest request) {
+        // TODO Auto-generated constructor stub
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = planmasterController.ytiotXjPlanMasterService.getPlanMasterList(jsonObject.toString(), page, start, limit, sort);
 //			System.out.println(ret);
-			mav.addObject("ret_str", ret);
-			
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-	//巡检
-	@RequestMapping(value="/getList1",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView  getList1(@RequestParam(value = "queryJson", required = false) String queryJson,
-			@RequestParam(value = "page", required = false) String page,
-			@RequestParam(value = "start", required = false) String start,
-			@RequestParam(value = "limit", required = false) String limit,
-			@RequestParam(value = "sort", required = false) String sort) {
-		// TODO Auto-generated constructor stub
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  planmasterController.ytiotXjPlanMasterService.getPlanMasterList1(queryJson,page,start,limit,sort);
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    //巡检
+    @RequestMapping(value = "/getList1", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView getList1(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                 @RequestParam(value = "page", required = false) String page,
+                                 @RequestParam(value = "start", required = false) String start,
+                                 @RequestParam(value = "limit", required = false) String limit,
+                                 @RequestParam(value = "sort", required = false) String sort,
+                                 HttpServletRequest request) {
+        // TODO Auto-generated constructor stub
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = planmasterController.ytiotXjPlanMasterService.getPlanMasterList1(jsonObject.toString(), page, start, limit, sort);
 //			System.out.println(ret);
-			mav.addObject("ret_str", ret);
-			
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-
-	@RequestMapping(value="/append",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView append(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  planmasterController.ytiotXjPlanMasterService.appendPlanMaster(queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-	
-	//巡检
-	@RequestMapping(value="/append1",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView append1(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  planmasterController.ytiotXjPlanMasterService.appendPlanMaster1(queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-
-	@RequestMapping(value="/update",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView update(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  planmasterController.ytiotXjPlanMasterService.updatePlanMaster(queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-
-	@RequestMapping(value="/del",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView del(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret = planmasterController.ytiotXjPlanMasterService.deletePlanMaster(queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-	//导出
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+
+    @RequestMapping(value = "/append", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView append(@RequestParam(value = "queryJson", required = false) String queryJson,
+                               HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = planmasterController.ytiotXjPlanMasterService.appendPlanMaster(jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+
+    //巡检
+    @RequestMapping(value = "/append1", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView append1(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = planmasterController.ytiotXjPlanMasterService.appendPlanMaster1(jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+
+    @RequestMapping(value = "/update", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView update(@RequestParam(value = "queryJson", required = false) String queryJson,
+                               HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = planmasterController.ytiotXjPlanMasterService.updatePlanMaster(jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+
+    @RequestMapping(value = "/del", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView del(@RequestParam(value = "queryJson", required = false) String queryJson,
+                            HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = planmasterController.ytiotXjPlanMasterService.deletePlanMaster(jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    //导出
 //	@RequestMapping(value="/exl",method= {RequestMethod.GET,RequestMethod.POST})
 //	public ModelAndView exl(@RequestParam(value = "queryJson", required = false) String queryJson) {
 //		ModelAndView mav = new ModelAndView();

src/cn/com/usky/iot/controller/PlanTeamController.java

@@ -2,7 +2,14 @@ package cn.com.usky.iot.controller;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 
+import cn.com.usky.iot.auth.TokenAuthBO;
+import cn.com.usky.iot.auth.TokenAuthService;
+import cn.com.usky.iot.controller.login.Constants;
+import cn.com.usky.iot.entity.YtiotTAdmin;
+import cn.com.usky.utils.HttpServletRequestUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -27,18 +34,34 @@ public class PlanTeamController {
 		 planteamController.ytiotXjPlanTeamService = this.ytiotXjPlanTeamService;
 	 }
 
+	@Autowired
+	private TokenAuthService tokenAuthService;
+
 	@RequestMapping(value="/getList",method= {RequestMethod.GET,RequestMethod.POST})
 	public ModelAndView  getList(@RequestParam(value = "queryJson", required = false) String queryJson,
 			@RequestParam(value = "page", required = false) String page,
 			@RequestParam(value = "start", required = false) String start,
 			@RequestParam(value = "limit", required = false) String limit,
-			@RequestParam(value = "sort", required = false) String sort) {
+			@RequestParam(value = "sort", required = false) String sort,
+								 HttpServletRequest request) {
 		// TODO Auto-generated constructor stub
 		ModelAndView mav = new ModelAndView();
+		TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+		boolean isAuth = tokenAuthBO.isAuthState();
+		if (!isAuth) {
+			com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+			json.put("check", false);
+			json.put("errMsg", "权限错误，请重新登录");
+			mav.addObject("ret_str", json.toJSONString());
+		}
 		mav.setViewName("return");
-//		System.out.println(queryJson);
+		//通过获取用户信息
+		YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+		com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+		jsonObject.put("V_LOGINNAME", o.getVLoginname());
+		jsonObject.put("V_PASSWORD", o.getVPassword());
 		try {
-			String ret =  planteamController.ytiotXjPlanTeamService.getPlanTeamList(queryJson,page,start,limit,sort);
+			String ret =  planteamController.ytiotXjPlanTeamService.getPlanTeamList(jsonObject.toString(),page,start,limit,sort);
 //			System.out.println(ret);
 			mav.addObject("ret_str", ret);
 			
@@ -54,13 +77,26 @@ public class PlanTeamController {
 			@RequestParam(value = "page", required = false) String page,
 			@RequestParam(value = "start", required = false) String start,
 			@RequestParam(value = "limit", required = false) String limit,
-			@RequestParam(value = "sort", required = false) String sort) {
+			@RequestParam(value = "sort", required = false) String sort,
+								  HttpServletRequest request) {
 		// TODO Auto-generated constructor stub
 		ModelAndView mav = new ModelAndView();
+		TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+		boolean isAuth = tokenAuthBO.isAuthState();
+		if (!isAuth) {
+			com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+			json.put("check", false);
+			json.put("errMsg", "权限错误，请重新登录");
+			mav.addObject("ret_str", json.toJSONString());
+		}
 		mav.setViewName("return");
-//		System.out.println(queryJson);
+		//通过获取用户信息
+		YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+		com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+		jsonObject.put("V_LOGINNAME", o.getVLoginname());
+		jsonObject.put("V_PASSWORD", o.getVPassword());
 		try {
-			String ret =  planteamController.ytiotXjPlanTeamService.getPlanTeamList1(queryJson,page,start,limit,sort);
+			String ret =  planteamController.ytiotXjPlanTeamService.getPlanTeamList1(jsonObject.toString(),page,start,limit,sort);
 //			System.out.println(ret);
 			mav.addObject("ret_str", ret);
 			
@@ -73,12 +109,25 @@ public class PlanTeamController {
 	
 
 	@RequestMapping(value="/append",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView append(@RequestParam(value = "queryJson", required = false) String queryJson) {
+	public ModelAndView append(@RequestParam(value = "queryJson", required = false) String queryJson,
+							   HttpServletRequest request) {
 		ModelAndView mav = new ModelAndView();
+		TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+		boolean isAuth = tokenAuthBO.isAuthState();
+		if (!isAuth) {
+			com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+			json.put("check", false);
+			json.put("errMsg", "权限错误，请重新登录");
+			mav.addObject("ret_str", json.toJSONString());
+		}
 		mav.setViewName("return");
-		System.out.println("测试"+queryJson);
+		//通过获取用户信息
+		YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+		com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+		jsonObject.put("V_LOGINNAME", o.getVLoginname());
+		jsonObject.put("V_PASSWORD", o.getVPassword());
 		try {
-			String ret =  planteamController.ytiotXjPlanTeamService.appendPlanTeam(queryJson);
+			String ret =  planteamController.ytiotXjPlanTeamService.appendPlanTeam(jsonObject.toString());
 			mav.addObject("ret_str",ret);
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -87,12 +136,25 @@ public class PlanTeamController {
 	}
 	
 	@RequestMapping(value="/append1",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView append1(@RequestParam(value = "queryJson", required = false) String queryJson) {
+	public ModelAndView append1(@RequestParam(value = "queryJson", required = false) String queryJson,
+								HttpServletRequest request) {
 		ModelAndView mav = new ModelAndView();
+		TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+		boolean isAuth = tokenAuthBO.isAuthState();
+		if (!isAuth) {
+			com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+			json.put("check", false);
+			json.put("errMsg", "权限错误，请重新登录");
+			mav.addObject("ret_str", json.toJSONString());
+		}
 		mav.setViewName("return");
-		System.out.println("测试"+queryJson);
+		//通过获取用户信息
+		YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+		com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+		jsonObject.put("V_LOGINNAME", o.getVLoginname());
+		jsonObject.put("V_PASSWORD", o.getVPassword());
 		try {
-			String ret =  planteamController.ytiotXjPlanTeamService.appendPlanTeam1(queryJson);
+			String ret =  planteamController.ytiotXjPlanTeamService.appendPlanTeam1(jsonObject.toString());
 			mav.addObject("ret_str",ret);
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -102,12 +164,25 @@ public class PlanTeamController {
 	
 
 	@RequestMapping(value="/update",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView update(@RequestParam(value = "queryJson", required = false) String queryJson) {
+	public ModelAndView update(@RequestParam(value = "queryJson", required = false) String queryJson,
+							   HttpServletRequest request) {
 		ModelAndView mav = new ModelAndView();
+		TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+		boolean isAuth = tokenAuthBO.isAuthState();
+		if (!isAuth) {
+			com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+			json.put("check", false);
+			json.put("errMsg", "权限错误，请重新登录");
+			mav.addObject("ret_str", json.toJSONString());
+		}
 		mav.setViewName("return");
-//		System.out.println(queryJson);
+		//通过获取用户信息
+		YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+		com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+		jsonObject.put("V_LOGINNAME", o.getVLoginname());
+		jsonObject.put("V_PASSWORD", o.getVPassword());
 		try {
-			String ret =  planteamController.ytiotXjPlanTeamService.updatePlanTeam(queryJson);
+			String ret =  planteamController.ytiotXjPlanTeamService.updatePlanTeam(jsonObject.toString());
 			mav.addObject("ret_str",ret);
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -118,12 +193,25 @@ public class PlanTeamController {
 	
 
 	@RequestMapping(value="/del",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView del(@RequestParam(value = "queryJson", required = false) String queryJson) {
+	public ModelAndView del(@RequestParam(value = "queryJson", required = false) String queryJson,
+							HttpServletRequest request) {
 		ModelAndView mav = new ModelAndView();
+		TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+		boolean isAuth = tokenAuthBO.isAuthState();
+		if (!isAuth) {
+			com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+			json.put("check", false);
+			json.put("errMsg", "权限错误，请重新登录");
+			mav.addObject("ret_str", json.toJSONString());
+		}
 		mav.setViewName("return");
-//		System.out.println(queryJson);
+		//通过获取用户信息
+		YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+		com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+		jsonObject.put("V_LOGINNAME", o.getVLoginname());
+		jsonObject.put("V_PASSWORD", o.getVPassword());
 		try {
-			String ret = planteamController.ytiotXjPlanTeamService.deletePlanTeam(queryJson);
+			String ret = planteamController.ytiotXjPlanTeamService.deletePlanTeam(jsonObject.toString());
 			mav.addObject("ret_str",ret);
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -132,13 +220,26 @@ public class PlanTeamController {
 	}
 	
 	@RequestMapping(value="/getzrrList",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView  getList(@RequestParam(value = "queryJson", required = false) String queryJson) {
+	public ModelAndView  getList(@RequestParam(value = "queryJson", required = false) String queryJson,
+								 HttpServletRequest request) {
 		// TODO Auto-generated constructor stub
 		ModelAndView mav = new ModelAndView();
+		TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+		boolean isAuth = tokenAuthBO.isAuthState();
+		if (!isAuth) {
+			com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+			json.put("check", false);
+			json.put("errMsg", "权限错误，请重新登录");
+			mav.addObject("ret_str", json.toJSONString());
+		}
 		mav.setViewName("return");
-//		System.out.println(queryJson);
+		//通过获取用户信息
+		YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+		com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+		jsonObject.put("V_LOGINNAME", o.getVLoginname());
+		jsonObject.put("V_PASSWORD", o.getVPassword());
 		try {
-			String ret =  planteamController.ytiotXjPlanTeamService.getPlanTeamzrrList(queryJson);
+			String ret =  planteamController.ytiotXjPlanTeamService.getPlanTeamzrrList(jsonObject.toString());
 //			System.out.println(ret);
 			mav.addObject("ret_str", ret);
 			
@@ -150,13 +251,26 @@ public class PlanTeamController {
 	}
 	
 	@RequestMapping(value="/getzrrList1",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView  getList1(@RequestParam(value = "queryJson", required = false) String queryJson) {
+	public ModelAndView  getList1(@RequestParam(value = "queryJson", required = false) String queryJson,
+								  HttpServletRequest request) {
 		// TODO Auto-generated constructor stub
 		ModelAndView mav = new ModelAndView();
+		TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+		boolean isAuth = tokenAuthBO.isAuthState();
+		if (!isAuth) {
+			com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+			json.put("check", false);
+			json.put("errMsg", "权限错误，请重新登录");
+			mav.addObject("ret_str", json.toJSONString());
+		}
 		mav.setViewName("return");
-//		System.out.println(queryJson);
+		//通过获取用户信息
+		YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+		com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+		jsonObject.put("V_LOGINNAME", o.getVLoginname());
+		jsonObject.put("V_PASSWORD", o.getVPassword());
 		try {
-			String ret =  planteamController.ytiotXjPlanTeamService.getPlanTeamzrrList1(queryJson);
+			String ret =  planteamController.ytiotXjPlanTeamService.getPlanTeamzrrList1(jsonObject.toString());
 //			System.out.println(ret);
 			mav.addObject("ret_str", ret);
 			

src/cn/com/usky/iot/controller/PointController.java

@@ -2,7 +2,14 @@ package cn.com.usky.iot.controller;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 
+import cn.com.usky.iot.auth.TokenAuthBO;
+import cn.com.usky.iot.auth.TokenAuthService;
+import cn.com.usky.iot.controller.login.Constants;
+import cn.com.usky.iot.entity.YtiotTAdmin;
+import cn.com.usky.utils.HttpServletRequestUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -15,102 +22,174 @@ import cn.com.usky.iot.point.service.YtiotTPointService;
 @RequestMapping("/iot/point")
 public class PointController {
 
-	@Resource
-	private YtiotTPointService ytiotTPointService;
-	
-	private static PointController pointController;
-	
-	
-	 @PostConstruct
-	 public void init() {
-		 pointController = this;
-		 pointController.ytiotTPointService = this.ytiotTPointService;
-	 }
-
-	@RequestMapping(value="/getList",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView  getList(@RequestParam(value = "queryJson", required = false) String queryJson,
-			@RequestParam(value = "page", required = false) String page,
-			@RequestParam(value = "start", required = false) String start,
-			@RequestParam(value = "limit", required = false) String limit,
-			@RequestParam(value = "sort", required = false) String sort) {
-		// TODO Auto-generated constructor stub
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret = pointController.ytiotTPointService.getPointList(queryJson,page,start,limit,sort);
+    @Resource
+    private YtiotTPointService ytiotTPointService;
+
+    private static PointController pointController;
+
+
+    @PostConstruct
+    public void init() {
+        pointController = this;
+        pointController.ytiotTPointService = this.ytiotTPointService;
+    }
+
+    @Autowired
+    private TokenAuthService tokenAuthService;
+
+    @RequestMapping(value = "/getList", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView getList(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                @RequestParam(value = "page", required = false) String page,
+                                @RequestParam(value = "start", required = false) String start,
+                                @RequestParam(value = "limit", required = false) String limit,
+                                @RequestParam(value = "sort", required = false) String sort,
+                                HttpServletRequest request) {
+        // TODO Auto-generated constructor stub
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = pointController.ytiotTPointService.getPointList(jsonObject.toString(), page, start, limit, sort);
 //			System.out.println(ret);
-			mav.addObject("ret_str", ret);
-			
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	@RequestMapping(value="/getVerList",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView  getVerList(@RequestParam(value = "queryJson", required = false) String queryJson,
-			@RequestParam(value = "page", required = false) String page,
-			@RequestParam(value = "start", required = false) String start,
-			@RequestParam(value = "limit", required = false) String limit,
-			@RequestParam(value = "sort", required = false) String sort) {
-		// TODO Auto-generated constructor stub
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret = pointController.ytiotTPointService.getPointVerList(queryJson,page,start,limit,sort);
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/getVerList", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView getVerList(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                   @RequestParam(value = "page", required = false) String page,
+                                   @RequestParam(value = "start", required = false) String start,
+                                   @RequestParam(value = "limit", required = false) String limit,
+                                   @RequestParam(value = "sort", required = false) String sort,
+                                   HttpServletRequest request) {
+        // TODO Auto-generated constructor stub
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = pointController.ytiotTPointService.getPointVerList(jsonObject.toString(), page, start, limit, sort);
 //			System.out.println(ret);
-			mav.addObject("ret_str", ret);
-			
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	@RequestMapping(value="/append",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView append(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret = pointController.ytiotTPointService.appendPoint(queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	@RequestMapping(value="/update",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView update(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret = pointController.ytiotTPointService.updatePoint(queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	//注销
-	@RequestMapping(value="/del",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView del(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret = pointController.ytiotTPointService.deletePoint(queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-	//导出
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/append", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView append(@RequestParam(value = "queryJson", required = false) String queryJson,
+                               HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = pointController.ytiotTPointService.appendPoint(jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/update", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView update(@RequestParam(value = "queryJson", required = false) String queryJson,
+                               HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = pointController.ytiotTPointService.updatePoint(jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    //注销
+    @RequestMapping(value = "/del", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView del(@RequestParam(value = "queryJson", required = false) String queryJson,
+                            HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = pointController.ytiotTPointService.deletePoint(jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    //导出
 //	@RequestMapping(value="/exl",method= {RequestMethod.GET,RequestMethod.POST})
 //	public ModelAndView exl(@RequestParam(value = "queryJson", required = false) String queryJson) {
 //		ModelAndView mav = new ModelAndView();

src/cn/com/usky/iot/controller/PzbController.java

@@ -2,7 +2,14 @@ package cn.com.usky.iot.controller;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 
+import cn.com.usky.iot.auth.TokenAuthBO;
+import cn.com.usky.iot.auth.TokenAuthService;
+import cn.com.usky.iot.controller.login.Constants;
+import cn.com.usky.iot.entity.YtiotTAdmin;
+import cn.com.usky.utils.HttpServletRequestUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -15,300 +22,524 @@ import cn.com.usky.iot.yypzb.service.YtiotYyPzbService;
 @RequestMapping("/iot/pzb")
 public class PzbController {
 
-	@Resource
-	private YtiotYyPzbService ytiotYyPzbService;
-	
-	private static PzbController pzbController;
-	
-	
-	 @PostConstruct
-	 public void init() {
-		 pzbController = this;
-		 pzbController.ytiotYyPzbService = this.ytiotYyPzbService;
-	 }
-
-	@RequestMapping(value="/getList",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView  getList(@RequestParam(value = "queryJson", required = false) String queryJson,
-			@RequestParam(value = "page", required = false) String page,
-			@RequestParam(value = "start", required = false) String start,
-			@RequestParam(value = "limit", required = false) String limit,
-			@RequestParam(value = "sort", required = false) String sort) {
-		// TODO Auto-generated constructor stub
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  pzbController.ytiotYyPzbService.getPzbList(queryJson,page,start,limit,sort);
+    @Resource
+    private YtiotYyPzbService ytiotYyPzbService;
+
+    private static PzbController pzbController;
+
+
+    @PostConstruct
+    public void init() {
+        pzbController = this;
+        pzbController.ytiotYyPzbService = this.ytiotYyPzbService;
+    }
+
+    @Autowired
+    private TokenAuthService tokenAuthService;
+
+    @RequestMapping(value = "/getList", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView getList(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                @RequestParam(value = "page", required = false) String page,
+                                @RequestParam(value = "start", required = false) String start,
+                                @RequestParam(value = "limit", required = false) String limit,
+                                @RequestParam(value = "sort", required = false) String sort,
+                                HttpServletRequest request) {
+        // TODO Auto-generated constructor stub
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = pzbController.ytiotYyPzbService.getPzbList(jsonObject.toString(), page, start, limit, sort);
 //			System.out.println(ret);
-			mav.addObject("ret_str", ret);
-			
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-	@RequestMapping(value="/getXhList",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView  getXhList(@RequestParam(value = "queryJson", required = false) String queryJson,
-			@RequestParam(value = "page", required = false) String page,
-			@RequestParam(value = "start", required = false) String start,
-			@RequestParam(value = "limit", required = false) String limit,
-			@RequestParam(value = "sort", required = false) String sort) {
-		// TODO Auto-generated constructor stub
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  pzbController.ytiotYyPzbService.getXhList(queryJson,page,start,limit,sort);
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/getXhList", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView getXhList(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                  @RequestParam(value = "page", required = false) String page,
+                                  @RequestParam(value = "start", required = false) String start,
+                                  @RequestParam(value = "limit", required = false) String limit,
+                                  @RequestParam(value = "sort", required = false) String sort,
+                                  HttpServletRequest request) {
+        // TODO Auto-generated constructor stub
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = pzbController.ytiotYyPzbService.getXhList(jsonObject.toString(), page, start, limit, sort);
 //			System.out.println(ret);
-			mav.addObject("ret_str", ret);
-			
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-	@RequestMapping(value="/getCompanyxxList",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView  getCompanyxxList(@RequestParam(value = "queryJson", required = false) String queryJson,
-			@RequestParam(value = "page", required = false) String page,
-			@RequestParam(value = "start", required = false) String start,
-			@RequestParam(value = "limit", required = false) String limit,
-			@RequestParam(value = "sort", required = false) String sort) {
-		// TODO Auto-generated constructor stub
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  pzbController.ytiotYyPzbService.getCompanyxxList(queryJson,page,start,limit,sort);
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/getCompanyxxList", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView getCompanyxxList(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                         @RequestParam(value = "page", required = false) String page,
+                                         @RequestParam(value = "start", required = false) String start,
+                                         @RequestParam(value = "limit", required = false) String limit,
+                                         @RequestParam(value = "sort", required = false) String sort,
+                                         HttpServletRequest request) {
+        // TODO Auto-generated constructor stub
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = pzbController.ytiotYyPzbService.getCompanyxxList(jsonObject.toString(), page, start, limit, sort);
 //			System.out.println(ret);
-			mav.addObject("ret_str", ret);
-			
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-	@RequestMapping(value="/getCompanyUser",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView  getCompanyUser(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		// TODO Auto-generated constructor stub
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  pzbController.ytiotYyPzbService.getCompanyUser(queryJson);
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/getCompanyUser", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView getCompanyUser(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                       HttpServletRequest request) {
+        // TODO Auto-generated constructor stub
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = pzbController.ytiotYyPzbService.getCompanyUser(jsonObject.toString());
 //			System.out.println(ret);
-			mav.addObject("ret_str", ret);
-			
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-	@RequestMapping(value="/getxx",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView  getxx(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		// TODO Auto-generated constructor stub
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  pzbController.ytiotYyPzbService.getxx(queryJson);
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/getxx", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView getxx(@RequestParam(value = "queryJson", required = false) String queryJson,
+                              HttpServletRequest request) {
+        // TODO Auto-generated constructor stub
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = pzbController.ytiotYyPzbService.getxx(jsonObject.toString());
 //			System.out.println(ret);
-			mav.addObject("ret_str", ret);
-			
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-	@RequestMapping(value="/getCzjlList",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView  getCzjlList(@RequestParam(value = "queryJson", required = false) String queryJson,
-			@RequestParam(value = "page", required = false) String page,
-			@RequestParam(value = "start", required = false) String start,
-			@RequestParam(value = "limit", required = false) String limit,
-			@RequestParam(value = "sort", required = false) String sort) {
-		// TODO Auto-generated constructor stub
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  pzbController.ytiotYyPzbService.getCzjlList(queryJson,page,start,limit,sort);
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/getCzjlList", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView getCzjlList(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                    @RequestParam(value = "page", required = false) String page,
+                                    @RequestParam(value = "start", required = false) String start,
+                                    @RequestParam(value = "limit", required = false) String limit,
+                                    @RequestParam(value = "sort", required = false) String sort,
+                                    HttpServletRequest request) {
+        // TODO Auto-generated constructor stub
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = pzbController.ytiotYyPzbService.getCzjlList(jsonObject.toString(), page, start, limit, sort);
 //			System.out.println(ret);
-			mav.addObject("ret_str", ret);
-			
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-
-	@RequestMapping(value="/append",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView append(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  pzbController.ytiotYyPzbService.appendPzb(queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-	@RequestMapping(value="/appendXh",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView appendXh(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  pzbController.ytiotYyPzbService.appendXh(queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-
-	@RequestMapping(value="/appendCompanyxx",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView appendCompanyxx(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  pzbController.ytiotYyPzbService.appendCompanyxx(queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-	@RequestMapping(value="/appendCz",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView appendCz(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  pzbController.ytiotYyPzbService.appendCz(queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-
-	@RequestMapping(value="/update",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView update(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  pzbController.ytiotYyPzbService.updatePzb(queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-	@RequestMapping(value="/updateXh",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView updateXh(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  pzbController.ytiotYyPzbService.updateXh(queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-	@RequestMapping(value="/updateCompanyxx",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView updateCompanyxx(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  pzbController.ytiotYyPzbService.updateCompanyxx(queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-
-	@RequestMapping(value="/delCompanyxx",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView delCompanyxx(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret = pzbController.ytiotYyPzbService.deleteCompanyxx(queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-	@RequestMapping(value="/del",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView del(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret = pzbController.ytiotYyPzbService.deletePzb(queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-	@RequestMapping(value="/deleteXh",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView deleteXh(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret = pzbController.ytiotYyPzbService.deleteXh(queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-	
-	@RequestMapping(value="/getpzbsl",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView  getpzbsl(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		// TODO Auto-generated constructor stub
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  pzbController.ytiotYyPzbService.getPzbSl(queryJson);
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+
+    @RequestMapping(value = "/append", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView append(@RequestParam(value = "queryJson", required = false) String queryJson,
+                               HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = pzbController.ytiotYyPzbService.appendPzb(jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/appendXh", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView appendXh(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                 HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = pzbController.ytiotYyPzbService.appendXh(jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/appendCompanyxx", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView appendCompanyxx(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                        HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = pzbController.ytiotYyPzbService.appendCompanyxx(jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/appendCz", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView appendCz(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                 HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = pzbController.ytiotYyPzbService.appendCz(jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/update", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView update(@RequestParam(value = "queryJson", required = false) String queryJson,
+                               HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = pzbController.ytiotYyPzbService.updatePzb(jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/updateXh", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView updateXh(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                 HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = pzbController.ytiotYyPzbService.updateXh(jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/updateCompanyxx", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView updateCompanyxx(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                        HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = pzbController.ytiotYyPzbService.updateCompanyxx(jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+
+    @RequestMapping(value = "/delCompanyxx", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView delCompanyxx(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                     HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = pzbController.ytiotYyPzbService.deleteCompanyxx(jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/del", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView del(@RequestParam(value = "queryJson", required = false) String queryJson,
+                            HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = pzbController.ytiotYyPzbService.deletePzb(jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/deleteXh", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView deleteXh(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                 HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = pzbController.ytiotYyPzbService.deleteXh(jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+
+    @RequestMapping(value = "/getpzbsl", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView getpzbsl(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                 HttpServletRequest request) {
+        // TODO Auto-generated constructor stub
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = pzbController.ytiotYyPzbService.getPzbSl(jsonObject.toString());
 //			System.out.println(ret);
-			mav.addObject("ret_str", ret);
-			
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
 }

src/cn/com/usky/iot/controller/QrcodeAnalysis2Controller.java

@@ -2,7 +2,14 @@ package cn.com.usky.iot.controller;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 
+import cn.com.usky.iot.auth.TokenAuthBO;
+import cn.com.usky.iot.auth.TokenAuthService;
+import cn.com.usky.iot.controller.login.Constants;
+import cn.com.usky.iot.entity.YtiotTAdmin;
+import cn.com.usky.utils.HttpServletRequestUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -15,62 +22,92 @@ import cn.com.usky.iot.qrcodeanalysis2.service.YtiotTQrcodeAnalysis2Service;
 @RequestMapping("/iot/qrcodeanalysis2")
 public class QrcodeAnalysis2Controller {
 
-	@Resource
-	private YtiotTQrcodeAnalysis2Service ytiotTQrcodeAnalysis2Service;
-	
-	private static QrcodeAnalysis2Controller qrcodeanalysis2Controller;
-	
-	
-	 @PostConstruct
-	 public void init() {
-		 qrcodeanalysis2Controller = this;
-		 qrcodeanalysis2Controller.ytiotTQrcodeAnalysis2Service = this.ytiotTQrcodeAnalysis2Service;
-	 }
-
-	@RequestMapping(value="/getList",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView  getList(@RequestParam(value = "queryJson", required = false) String queryJson,
-			@RequestParam(value = "page", required = false) String page,
-			@RequestParam(value = "start", required = false) String start,
-			@RequestParam(value = "limit", required = false) String limit,
-			@RequestParam(value = "sort", required = false) String sort) {
-		// TODO Auto-generated constructor stub
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  qrcodeanalysis2Controller.ytiotTQrcodeAnalysis2Service.getQrcodeAnalysis2List(queryJson,page,start,limit,sort);
+    @Resource
+    private YtiotTQrcodeAnalysis2Service ytiotTQrcodeAnalysis2Service;
+
+    private static QrcodeAnalysis2Controller qrcodeanalysis2Controller;
+
+
+    @PostConstruct
+    public void init() {
+        qrcodeanalysis2Controller = this;
+        qrcodeanalysis2Controller.ytiotTQrcodeAnalysis2Service = this.ytiotTQrcodeAnalysis2Service;
+    }
+
+    @Autowired
+    private TokenAuthService tokenAuthService;
+
+    @RequestMapping(value = "/getList", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView getList(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                @RequestParam(value = "page", required = false) String page,
+                                @RequestParam(value = "start", required = false) String start,
+                                @RequestParam(value = "limit", required = false) String limit,
+                                @RequestParam(value = "sort", required = false) String sort,
+                                HttpServletRequest request) {
+        // TODO Auto-generated constructor stub
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = qrcodeanalysis2Controller.ytiotTQrcodeAnalysis2Service.getQrcodeAnalysis2List(jsonObject.toString(), page, start, limit, sort);
 //			System.out.println(ret);
-			mav.addObject("ret_str", ret);
-			
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-	@RequestMapping(value="/getList1",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView  getList1(@RequestParam(value = "queryJson", required = false) String queryJson,
-			@RequestParam(value = "page", required = false) String page,
-			@RequestParam(value = "start", required = false) String start,
-			@RequestParam(value = "limit", required = false) String limit,
-			@RequestParam(value = "sort", required = false) String sort) {
-		// TODO Auto-generated constructor stub
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  qrcodeanalysis2Controller.ytiotTQrcodeAnalysis2Service.getQrcodeAnalysis2List1(queryJson,page,start,limit,sort);
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/getList1", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView getList1(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                 @RequestParam(value = "page", required = false) String page,
+                                 @RequestParam(value = "start", required = false) String start,
+                                 @RequestParam(value = "limit", required = false) String limit,
+                                 @RequestParam(value = "sort", required = false) String sort,
+                                 HttpServletRequest request) {
+        // TODO Auto-generated constructor stub
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = qrcodeanalysis2Controller.ytiotTQrcodeAnalysis2Service.getQrcodeAnalysis2List1(jsonObject.toString(), page, start, limit, sort);
 //			System.out.println(ret);
-			mav.addObject("ret_str", ret);
-			
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
-//	@RequestMapping(value="/getVerList",method= {RequestMethod.GET,RequestMethod.POST})
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    //	@RequestMapping(value="/getVerList",method= {RequestMethod.GET,RequestMethod.POST})
 //	public ModelAndView  getVerList(@RequestParam(value = "queryJson", required = false) String queryJson,
 //			@RequestParam(value = "page", required = false) String page,
 //			@RequestParam(value = "start", required = false) String start,
@@ -91,62 +128,114 @@ public class QrcodeAnalysis2Controller {
 //		}
 //		return mav;
 //	}
-	@RequestMapping(value="/append",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView append(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  qrcodeanalysis2Controller.ytiotTQrcodeAnalysis2Service.appendQrcodeAnalysis2(queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-	@RequestMapping(value="/append1",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView append1(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  qrcodeanalysis2Controller.ytiotTQrcodeAnalysis2Service.appendQrcodeAnalysis21(queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-	@RequestMapping(value="/update",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView update(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  qrcodeanalysis2Controller.ytiotTQrcodeAnalysis2Service.updateQrcodeAnalysis2(queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-	@RequestMapping(value="/update1",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView update1(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  qrcodeanalysis2Controller.ytiotTQrcodeAnalysis2Service.updateQrcodeAnalysis21(queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	//注销
+    @RequestMapping(value = "/append", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView append(@RequestParam(value = "queryJson", required = false) String queryJson,
+                               HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = qrcodeanalysis2Controller.ytiotTQrcodeAnalysis2Service.appendQrcodeAnalysis2(jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/append1", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView append1(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = qrcodeanalysis2Controller.ytiotTQrcodeAnalysis2Service.appendQrcodeAnalysis21(jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/update", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView update(@RequestParam(value = "queryJson", required = false) String queryJson,
+                               HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = qrcodeanalysis2Controller.ytiotTQrcodeAnalysis2Service.updateQrcodeAnalysis2(jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/update1", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView update1(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = qrcodeanalysis2Controller.ytiotTQrcodeAnalysis2Service.updateQrcodeAnalysis21(jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+    //注销
 //	@RequestMapping(value="/del",method= {RequestMethod.GET,RequestMethod.POST})
 //	public ModelAndView del(@RequestParam(value = "queryJson", required = false) String queryJson) {
 //		ModelAndView mav = new ModelAndView();
@@ -160,8 +249,8 @@ public class QrcodeAnalysis2Controller {
 //		}
 //		return mav;
 //	}
-	
-	//导出
+
+    //导出
 //	@RequestMapping(value="/exl",method= {RequestMethod.GET,RequestMethod.POST})
 //	public ModelAndView exl(@RequestParam(value = "queryJson", required = false) String queryJson) {
 //		ModelAndView mav = new ModelAndView();

src/cn/com/usky/iot/controller/QrcodeAnalysisController.java

@@ -2,7 +2,14 @@ package cn.com.usky.iot.controller;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 
+import cn.com.usky.iot.auth.TokenAuthBO;
+import cn.com.usky.iot.auth.TokenAuthService;
+import cn.com.usky.iot.controller.login.Constants;
+import cn.com.usky.iot.entity.YtiotTAdmin;
+import cn.com.usky.utils.HttpServletRequestUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -15,62 +22,92 @@ import cn.com.usky.iot.qrcodeanalysis.service.YtiotTQrcodeAnalysisService;
 @RequestMapping("/iot/qrcodeanalysis")
 public class QrcodeAnalysisController {
 
-	@Resource
-	private YtiotTQrcodeAnalysisService ytiotTQrcodeAnalysisService;
-	
-	private static QrcodeAnalysisController qrcodeanalysisController;
-	
-	
-	 @PostConstruct
-	 public void init() {
-		 qrcodeanalysisController = this;
-		 qrcodeanalysisController.ytiotTQrcodeAnalysisService = this.ytiotTQrcodeAnalysisService;
-	 }
-
-	@RequestMapping(value="/getList",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView  getList(@RequestParam(value = "queryJson", required = false) String queryJson,
-			@RequestParam(value = "page", required = false) String page,
-			@RequestParam(value = "start", required = false) String start,
-			@RequestParam(value = "limit", required = false) String limit,
-			@RequestParam(value = "sort", required = false) String sort) {
-		// TODO Auto-generated constructor stub
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  qrcodeanalysisController.ytiotTQrcodeAnalysisService.getQrcodeAnalysisList(queryJson,page,start,limit,sort);
+    @Resource
+    private YtiotTQrcodeAnalysisService ytiotTQrcodeAnalysisService;
+
+    private static QrcodeAnalysisController qrcodeanalysisController;
+
+
+    @PostConstruct
+    public void init() {
+        qrcodeanalysisController = this;
+        qrcodeanalysisController.ytiotTQrcodeAnalysisService = this.ytiotTQrcodeAnalysisService;
+    }
+
+    @Autowired
+    private TokenAuthService tokenAuthService;
+
+    @RequestMapping(value = "/getList", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView getList(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                @RequestParam(value = "page", required = false) String page,
+                                @RequestParam(value = "start", required = false) String start,
+                                @RequestParam(value = "limit", required = false) String limit,
+                                @RequestParam(value = "sort", required = false) String sort,
+                                HttpServletRequest request) {
+        // TODO Auto-generated constructor stub
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = qrcodeanalysisController.ytiotTQrcodeAnalysisService.getQrcodeAnalysisList(jsonObject.toString(), page, start, limit, sort);
 //			System.out.println(ret);
-			mav.addObject("ret_str", ret);
-			
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-	@RequestMapping(value="/getList1",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView  getList1(@RequestParam(value = "queryJson", required = false) String queryJson,
-			@RequestParam(value = "page", required = false) String page,
-			@RequestParam(value = "start", required = false) String start,
-			@RequestParam(value = "limit", required = false) String limit,
-			@RequestParam(value = "sort", required = false) String sort) {
-		// TODO Auto-generated constructor stub
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  qrcodeanalysisController.ytiotTQrcodeAnalysisService.getQrcodeAnalysisList1(queryJson,page,start,limit,sort);
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/getList1", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView getList1(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                 @RequestParam(value = "page", required = false) String page,
+                                 @RequestParam(value = "start", required = false) String start,
+                                 @RequestParam(value = "limit", required = false) String limit,
+                                 @RequestParam(value = "sort", required = false) String sort,
+                                 HttpServletRequest request) {
+        // TODO Auto-generated constructor stub
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = qrcodeanalysisController.ytiotTQrcodeAnalysisService.getQrcodeAnalysisList1(jsonObject.toString(), page, start, limit, sort);
 //			System.out.println(ret);
-			mav.addObject("ret_str", ret);
-			
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
-//	@RequestMapping(value="/getVerList",method= {RequestMethod.GET,RequestMethod.POST})
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    //	@RequestMapping(value="/getVerList",method= {RequestMethod.GET,RequestMethod.POST})
 //	public ModelAndView  getVerList(@RequestParam(value = "queryJson", required = false) String queryJson,
 //			@RequestParam(value = "page", required = false) String page,
 //			@RequestParam(value = "start", required = false) String start,
@@ -91,62 +128,114 @@ public class QrcodeAnalysisController {
 //		}
 //		return mav;
 //	}
-	@RequestMapping(value="/append",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView append(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  qrcodeanalysisController.ytiotTQrcodeAnalysisService.appendQrcodeAnalysis(queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-	@RequestMapping(value="/append1",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView append1(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  qrcodeanalysisController.ytiotTQrcodeAnalysisService.appendQrcodeAnalysis1(queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-	@RequestMapping(value="/update",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView update(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  qrcodeanalysisController.ytiotTQrcodeAnalysisService.updateQrcodeAnalysis(queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-	@RequestMapping(value="/update1",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView update1(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  qrcodeanalysisController.ytiotTQrcodeAnalysisService.updateQrcodeAnalysis1(queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	//注销
+    @RequestMapping(value = "/append", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView append(@RequestParam(value = "queryJson", required = false) String queryJson,
+                               HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = qrcodeanalysisController.ytiotTQrcodeAnalysisService.appendQrcodeAnalysis(jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/append1", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView append1(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = qrcodeanalysisController.ytiotTQrcodeAnalysisService.appendQrcodeAnalysis1(jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/update", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView update(@RequestParam(value = "queryJson", required = false) String queryJson,
+                               HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = qrcodeanalysisController.ytiotTQrcodeAnalysisService.updateQrcodeAnalysis(jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/update1", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView update1(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = qrcodeanalysisController.ytiotTQrcodeAnalysisService.updateQrcodeAnalysis1(jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+    //注销
 //	@RequestMapping(value="/del",method= {RequestMethod.GET,RequestMethod.POST})
 //	public ModelAndView del(@RequestParam(value = "queryJson", required = false) String queryJson) {
 //		ModelAndView mav = new ModelAndView();
@@ -160,8 +249,8 @@ public class QrcodeAnalysisController {
 //		}
 //		return mav;
 //	}
-	
-	//导出
+
+    //导出
 //	@RequestMapping(value="/exl",method= {RequestMethod.GET,RequestMethod.POST})
 //	public ModelAndView exl(@RequestParam(value = "queryJson", required = false) String queryJson) {
 //		ModelAndView mav = new ModelAndView();

src/cn/com/usky/iot/controller/Route2Controller.java

@@ -2,7 +2,14 @@ package cn.com.usky.iot.controller;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 
+import cn.com.usky.iot.auth.TokenAuthBO;
+import cn.com.usky.iot.auth.TokenAuthService;
+import cn.com.usky.iot.controller.login.Constants;
+import cn.com.usky.iot.entity.YtiotTAdmin;
+import cn.com.usky.utils.HttpServletRequestUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -15,62 +22,92 @@ import cn.com.usky.iot.route2.service.YtiotTRoute2Service;
 @RequestMapping("/iot/route2")
 public class Route2Controller {
 
-	@Resource
-	private YtiotTRoute2Service ytiotTRoute2Service;
-	
-	private static Route2Controller route2Controller;
-	
-	
-	 @PostConstruct
-	 public void init() {
-		 route2Controller = this;
-		 route2Controller.ytiotTRoute2Service = this.ytiotTRoute2Service;
-	 }
-
-	@RequestMapping(value="/getList",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView  getList(@RequestParam(value = "queryJson", required = false) String queryJson,
-			@RequestParam(value = "page", required = false) String page,
-			@RequestParam(value = "start", required = false) String start,
-			@RequestParam(value = "limit", required = false) String limit,
-			@RequestParam(value = "sort", required = false) String sort) {
-		// TODO Auto-generated constructor stub
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  route2Controller.ytiotTRoute2Service.getRoute2List(queryJson,page,start,limit,sort);
+    @Resource
+    private YtiotTRoute2Service ytiotTRoute2Service;
+
+    private static Route2Controller route2Controller;
+
+
+    @PostConstruct
+    public void init() {
+        route2Controller = this;
+        route2Controller.ytiotTRoute2Service = this.ytiotTRoute2Service;
+    }
+
+    @Autowired
+    private TokenAuthService tokenAuthService;
+
+    @RequestMapping(value = "/getList", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView getList(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                @RequestParam(value = "page", required = false) String page,
+                                @RequestParam(value = "start", required = false) String start,
+                                @RequestParam(value = "limit", required = false) String limit,
+                                @RequestParam(value = "sort", required = false) String sort,
+                                HttpServletRequest request) {
+        // TODO Auto-generated constructor stub
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = route2Controller.ytiotTRoute2Service.getRoute2List(jsonObject.toString(), page, start, limit, sort);
 //			System.out.println(ret);
-			mav.addObject("ret_str", ret);
-			
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-	@RequestMapping(value="/getList1",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView  getList1(@RequestParam(value = "queryJson", required = false) String queryJson,
-			@RequestParam(value = "page", required = false) String page,
-			@RequestParam(value = "start", required = false) String start,
-			@RequestParam(value = "limit", required = false) String limit,
-			@RequestParam(value = "sort", required = false) String sort) {
-		// TODO Auto-generated constructor stub
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  route2Controller.ytiotTRoute2Service.getRoute2List1(queryJson,page,start,limit,sort);
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/getList1", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView getList1(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                 @RequestParam(value = "page", required = false) String page,
+                                 @RequestParam(value = "start", required = false) String start,
+                                 @RequestParam(value = "limit", required = false) String limit,
+                                 @RequestParam(value = "sort", required = false) String sort,
+                                 HttpServletRequest request) {
+        // TODO Auto-generated constructor stub
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = route2Controller.ytiotTRoute2Service.getRoute2List1(jsonObject.toString(), page, start, limit, sort);
 //			System.out.println(ret);
-			mav.addObject("ret_str", ret);
-			
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
-//	@RequestMapping(value="/getVerList",method= {RequestMethod.GET,RequestMethod.POST})
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    //	@RequestMapping(value="/getVerList",method= {RequestMethod.GET,RequestMethod.POST})
 //	public ModelAndView  getVerList(@RequestParam(value = "queryJson", required = false) String queryJson,
 //			@RequestParam(value = "page", required = false) String page,
 //			@RequestParam(value = "start", required = false) String start,
@@ -91,61 +128,114 @@ public class Route2Controller {
 //		}
 //		return mav;
 //	}
-	@RequestMapping(value="/append",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView append(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  route2Controller.ytiotTRoute2Service.appendRoute2(queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-	@RequestMapping(value="/append1",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView append1(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  route2Controller.ytiotTRoute2Service.appendRoute21(queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	@RequestMapping(value="/update",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView update(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  route2Controller.ytiotTRoute2Service.updateRoute2(queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-	@RequestMapping(value="/update1",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView update1(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  route2Controller.ytiotTRoute2Service.updateRoute21(queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	//注销
+    @RequestMapping(value = "/append", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView append(@RequestParam(value = "queryJson", required = false) String queryJson,
+                               HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = route2Controller.ytiotTRoute2Service.appendRoute2(jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/append1", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView append1(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = route2Controller.ytiotTRoute2Service.appendRoute21(jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/update", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView update(@RequestParam(value = "queryJson", required = false) String queryJson,
+                               HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = route2Controller.ytiotTRoute2Service.updateRoute2(jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/update1", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView update1(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = route2Controller.ytiotTRoute2Service.updateRoute21(jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+    //注销
 //	@RequestMapping(value="/del",method= {RequestMethod.GET,RequestMethod.POST})
 //	public ModelAndView del(@RequestParam(value = "queryJson", required = false) String queryJson) {
 //		ModelAndView mav = new ModelAndView();
@@ -159,8 +249,8 @@ public class Route2Controller {
 //		}
 //		return mav;
 //	}
-	
-	//导出
+
+    //导出
 //	@RequestMapping(value="/exl",method= {RequestMethod.GET,RequestMethod.POST})
 //	public ModelAndView exl(@RequestParam(value = "queryJson", required = false) String queryJson) {
 //		ModelAndView mav = new ModelAndView();

src/cn/com/usky/iot/controller/RouteController.java

@@ -2,7 +2,14 @@ package cn.com.usky.iot.controller;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 
+import cn.com.usky.iot.auth.TokenAuthBO;
+import cn.com.usky.iot.auth.TokenAuthService;
+import cn.com.usky.iot.controller.login.Constants;
+import cn.com.usky.iot.entity.YtiotTAdmin;
+import cn.com.usky.utils.HttpServletRequestUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -15,62 +22,92 @@ import cn.com.usky.iot.route.service.YtiotTRouteService;
 @RequestMapping("/iot/route")
 public class RouteController {
 
-	@Resource
-	private YtiotTRouteService ytiotTRouteService;
-	
-	private static RouteController routeController;
-	
-	
-	 @PostConstruct
-	 public void init() {
-		 routeController = this;
-		 routeController.ytiotTRouteService = this.ytiotTRouteService;
-	 }
-
-	@RequestMapping(value="/getList",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView  getList(@RequestParam(value = "queryJson", required = false) String queryJson,
-			@RequestParam(value = "page", required = false) String page,
-			@RequestParam(value = "start", required = false) String start,
-			@RequestParam(value = "limit", required = false) String limit,
-			@RequestParam(value = "sort", required = false) String sort) {
-		// TODO Auto-generated constructor stub
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  routeController.ytiotTRouteService.getRouteList(queryJson,page,start,limit,sort);
+    @Resource
+    private YtiotTRouteService ytiotTRouteService;
+
+    private static RouteController routeController;
+
+
+    @PostConstruct
+    public void init() {
+        routeController = this;
+        routeController.ytiotTRouteService = this.ytiotTRouteService;
+    }
+
+    @Autowired
+    private TokenAuthService tokenAuthService;
+
+    @RequestMapping(value = "/getList", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView getList(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                @RequestParam(value = "page", required = false) String page,
+                                @RequestParam(value = "start", required = false) String start,
+                                @RequestParam(value = "limit", required = false) String limit,
+                                @RequestParam(value = "sort", required = false) String sort,
+                                HttpServletRequest request) {
+        // TODO Auto-generated constructor stub
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = routeController.ytiotTRouteService.getRouteList(jsonObject.toString(), page, start, limit, sort);
 //			System.out.println(ret);
-			mav.addObject("ret_str", ret);
-			
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-	@RequestMapping(value="/getList1",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView  getList1(@RequestParam(value = "queryJson", required = false) String queryJson,
-			@RequestParam(value = "page", required = false) String page,
-			@RequestParam(value = "start", required = false) String start,
-			@RequestParam(value = "limit", required = false) String limit,
-			@RequestParam(value = "sort", required = false) String sort) {
-		// TODO Auto-generated constructor stub
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  routeController.ytiotTRouteService.getRouteList1(queryJson,page,start,limit,sort);
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/getList1", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView getList1(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                 @RequestParam(value = "page", required = false) String page,
+                                 @RequestParam(value = "start", required = false) String start,
+                                 @RequestParam(value = "limit", required = false) String limit,
+                                 @RequestParam(value = "sort", required = false) String sort,
+                                 HttpServletRequest request) {
+        // TODO Auto-generated constructor stub
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = routeController.ytiotTRouteService.getRouteList1(jsonObject.toString(), page, start, limit, sort);
 //			System.out.println(ret);
-			mav.addObject("ret_str", ret);
-			
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
-//	@RequestMapping(value="/getVerList",method= {RequestMethod.GET,RequestMethod.POST})
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    //	@RequestMapping(value="/getVerList",method= {RequestMethod.GET,RequestMethod.POST})
 //	public ModelAndView  getVerList(@RequestParam(value = "queryJson", required = false) String queryJson,
 //			@RequestParam(value = "page", required = false) String page,
 //			@RequestParam(value = "start", required = false) String start,
@@ -91,61 +128,114 @@ public class RouteController {
 //		}
 //		return mav;
 //	}
-	@RequestMapping(value="/append",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView append(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  routeController.ytiotTRouteService.appendRoute(queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-	@RequestMapping(value="/append1",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView append1(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  routeController.ytiotTRouteService.appendRoute1(queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	@RequestMapping(value="/update",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView update(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  routeController.ytiotTRouteService.updateRoute(queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-	@RequestMapping(value="/update1",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView update1(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  routeController.ytiotTRouteService.updateRoute1(queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	//注销
+    @RequestMapping(value = "/append", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView append(@RequestParam(value = "queryJson", required = false) String queryJson,
+                               HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = routeController.ytiotTRouteService.appendRoute(jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/append1", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView append1(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = routeController.ytiotTRouteService.appendRoute1(jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/update", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView update(@RequestParam(value = "queryJson", required = false) String queryJson,
+                               HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = routeController.ytiotTRouteService.updateRoute(jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/update1", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView update1(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = routeController.ytiotTRouteService.updateRoute1(jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+    //注销
 //	@RequestMapping(value="/del",method= {RequestMethod.GET,RequestMethod.POST})
 //	public ModelAndView del(@RequestParam(value = "queryJson", required = false) String queryJson) {
 //		ModelAndView mav = new ModelAndView();
@@ -159,8 +249,8 @@ public class RouteController {
 //		}
 //		return mav;
 //	}
-	
-	//导出
+
+    //导出
 //	@RequestMapping(value="/exl",method= {RequestMethod.GET,RequestMethod.POST})
 //	public ModelAndView exl(@RequestParam(value = "queryJson", required = false) String queryJson) {
 //		ModelAndView mav = new ModelAndView();

src/cn/com/usky/iot/controller/SpotOperationRecordController.java

@@ -2,7 +2,14 @@ package cn.com.usky.iot.controller;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 
+import cn.com.usky.iot.auth.TokenAuthBO;
+import cn.com.usky.iot.auth.TokenAuthService;
+import cn.com.usky.iot.controller.login.Constants;
+import cn.com.usky.iot.entity.YtiotTAdmin;
+import cn.com.usky.utils.HttpServletRequestUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -15,180 +22,272 @@ import cn.com.usky.iot.xjspotoperationrecord.service.YtiotXjSpotOperationRecordS
 @RequestMapping("/iot/spotoperationrecord")
 public class SpotOperationRecordController {
 
-	@Resource
-	private YtiotXjSpotOperationRecordService ytiotXjSpotOperationRecordService;
-	
-	private static SpotOperationRecordController spotoperationrecordController;
-	
-	
-	 @PostConstruct
-	 public void init() {
-		 spotoperationrecordController = this;
-		 spotoperationrecordController.ytiotXjSpotOperationRecordService = this.ytiotXjSpotOperationRecordService;
-	 }
-
-
-	//维保列表数据
-	@RequestMapping(value="/getList",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView  getList(@RequestParam(value = "queryJson", required = false) String queryJson,
-			@RequestParam(value = "page", required = false) String page,
-			@RequestParam(value = "start", required = false) String start,
-			@RequestParam(value = "limit", required = false) String limit,
-			@RequestParam(value = "sort", required = false) String sort) {
-		// TODO Auto-generated constructor stub
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  spotoperationrecordController.ytiotXjSpotOperationRecordService.getSpotOperationRecordList(queryJson,page,start,limit,sort);
+    @Resource
+    private YtiotXjSpotOperationRecordService ytiotXjSpotOperationRecordService;
+
+    private static SpotOperationRecordController spotoperationrecordController;
+
+
+    @PostConstruct
+    public void init() {
+        spotoperationrecordController = this;
+        spotoperationrecordController.ytiotXjSpotOperationRecordService = this.ytiotXjSpotOperationRecordService;
+    }
+
+    @Autowired
+    private TokenAuthService tokenAuthService;
+
+
+    //维保列表数据
+    @RequestMapping(value = "/getList", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView getList(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                @RequestParam(value = "page", required = false) String page,
+                                @RequestParam(value = "start", required = false) String start,
+                                @RequestParam(value = "limit", required = false) String limit,
+                                @RequestParam(value = "sort", required = false) String sort,
+                                HttpServletRequest request) {
+        // TODO Auto-generated constructor stub
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = spotoperationrecordController.ytiotXjSpotOperationRecordService.getSpotOperationRecordList(jsonObject.toString(), page, start, limit, sort);
 //			System.out.println(ret);
-			mav.addObject("ret_str", ret);
-			
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
-
-	//维保总数数据
-	@RequestMapping(value="/getList3",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView  getList3(@RequestParam(value = "queryJson", required = false) String queryJson,
-								 @RequestParam(value = "page", required = false) String page,
-								 @RequestParam(value = "start", required = false) String start,
-								 @RequestParam(value = "limit", required = false) String limit,
-								 @RequestParam(value = "sort", required = false) String sort) {
-		// TODO Auto-generated constructor stub
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  spotoperationrecordController.ytiotXjSpotOperationRecordService.getSpotOperationRecordList3(queryJson,page,start,limit,sort);
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    //维保总数数据
+    @RequestMapping(value = "/getList3", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView getList3(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                 @RequestParam(value = "page", required = false) String page,
+                                 @RequestParam(value = "start", required = false) String start,
+                                 @RequestParam(value = "limit", required = false) String limit,
+                                 @RequestParam(value = "sort", required = false) String sort,
+                                 HttpServletRequest request) {
+        // TODO Auto-generated constructor stub
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = spotoperationrecordController.ytiotXjSpotOperationRecordService.getSpotOperationRecordList3(jsonObject.toString(), page, start, limit, sort);
 //			System.out.println(ret);
-			mav.addObject("ret_str", ret);
-
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
-
-
-	//巡检列表数据
-	@RequestMapping(value="/getList1",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView  getList1(@RequestParam(value = "queryJson", required = false) String queryJson,
-			@RequestParam(value = "page", required = false) String page,
-			@RequestParam(value = "start", required = false) String start,
-			@RequestParam(value = "limit", required = false) String limit,
-			@RequestParam(value = "sort", required = false) String sort) {
-		// TODO Auto-generated constructor stub
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  spotoperationrecordController.ytiotXjSpotOperationRecordService.getSpotOperationRecordList1(queryJson,page,start,limit,sort);
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+
+    //巡检列表数据
+    @RequestMapping(value = "/getList1", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView getList1(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                 @RequestParam(value = "page", required = false) String page,
+                                 @RequestParam(value = "start", required = false) String start,
+                                 @RequestParam(value = "limit", required = false) String limit,
+                                 @RequestParam(value = "sort", required = false) String sort,
+                                 HttpServletRequest request) {
+        // TODO Auto-generated constructor stub
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = spotoperationrecordController.ytiotXjSpotOperationRecordService.getSpotOperationRecordList1(jsonObject.toString(), page, start, limit, sort);
 //			System.out.println(ret);
-			mav.addObject("ret_str", ret);
-			
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
-
-
-	//巡检总数数据
-	@RequestMapping(value="/getList2",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView  getList2(@RequestParam(value = "queryJson", required = false) String queryJson,
-								  @RequestParam(value = "page", required = false) String page,
-								  @RequestParam(value = "start", required = false) String start,
-								  @RequestParam(value = "limit", required = false) String limit,
-								  @RequestParam(value = "sort", required = false) String sort) {
-		// TODO Auto-generated constructor stub
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  spotoperationrecordController.ytiotXjSpotOperationRecordService.getSpotOperationRecordList2(queryJson,page,start,limit,sort);
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+
+    //巡检总数数据
+    @RequestMapping(value = "/getList2", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView getList2(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                 @RequestParam(value = "page", required = false) String page,
+                                 @RequestParam(value = "start", required = false) String start,
+                                 @RequestParam(value = "limit", required = false) String limit,
+                                 @RequestParam(value = "sort", required = false) String sort,
+                                 HttpServletRequest request) {
+        // TODO Auto-generated constructor stub
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = spotoperationrecordController.ytiotXjSpotOperationRecordService.getSpotOperationRecordList2(jsonObject.toString(), page, start, limit, sort);
 //			System.out.println(ret);
-			mav.addObject("ret_str", ret);
-
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
-
-
-
-	
-	@RequestMapping(value="/getJlPointsList",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView  getJlPointsList(@RequestParam(value = "queryJson", required = false) String queryJson,
-			@RequestParam(value = "page", required = false) String page,
-			@RequestParam(value = "start", required = false) String start,
-			@RequestParam(value = "limit", required = false) String limit,
-			@RequestParam(value = "sort", required = false) String sort) {
-		// TODO Auto-generated constructor stub
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  spotoperationrecordController.ytiotXjSpotOperationRecordService.getJlPointsList(queryJson,page,start,limit,sort);
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+
+    @RequestMapping(value = "/getJlPointsList", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView getJlPointsList(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                        @RequestParam(value = "page", required = false) String page,
+                                        @RequestParam(value = "start", required = false) String start,
+                                        @RequestParam(value = "limit", required = false) String limit,
+                                        @RequestParam(value = "sort", required = false) String sort,
+                                        HttpServletRequest request) {
+        // TODO Auto-generated constructor stub
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = spotoperationrecordController.ytiotXjSpotOperationRecordService.getJlPointsList(jsonObject.toString(), page, start, limit, sort);
 //			System.out.println(ret);
-			mav.addObject("ret_str", ret);
-			
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-	@RequestMapping(value="/getJlPointsList1",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView  getJlPointsList1(@RequestParam(value = "queryJson", required = false) String queryJson,
-			@RequestParam(value = "page", required = false) String page,
-			@RequestParam(value = "start", required = false) String start,
-			@RequestParam(value = "limit", required = false) String limit,
-			@RequestParam(value = "sort", required = false) String sort) {
-		// TODO Auto-generated constructor stub
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  spotoperationrecordController.ytiotXjSpotOperationRecordService.getJlPointsList1(queryJson,page,start,limit,sort);
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/getJlPointsList1", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView getJlPointsList1(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                         @RequestParam(value = "page", required = false) String page,
+                                         @RequestParam(value = "start", required = false) String start,
+                                         @RequestParam(value = "limit", required = false) String limit,
+                                         @RequestParam(value = "sort", required = false) String sort,
+                                         HttpServletRequest request) {
+        // TODO Auto-generated constructor stub
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = spotoperationrecordController.ytiotXjSpotOperationRecordService.getJlPointsList1(jsonObject.toString(), page, start, limit, sort);
 //			System.out.println(ret);
-			mav.addObject("ret_str", ret);
-			
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-	@RequestMapping(value="/getxjfenxi",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView  getxjfenxi(@RequestParam(value = "queryJson", required = false) String queryJson,
-			@RequestParam(value = "page", required = false) String page,
-			@RequestParam(value = "start", required = false) String start,
-			@RequestParam(value = "limit", required = false) String limit,
-			@RequestParam(value = "sort", required = false) String sort) {
-		// TODO Auto-generated constructor stub
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret =  spotoperationrecordController.ytiotXjSpotOperationRecordService.getxjfenxi(queryJson);
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/getxjfenxi", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView getxjfenxi(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                   @RequestParam(value = "page", required = false) String page,
+                                   @RequestParam(value = "start", required = false) String start,
+                                   @RequestParam(value = "limit", required = false) String limit,
+                                   @RequestParam(value = "sort", required = false) String sort,
+                                   HttpServletRequest request) {
+        // TODO Auto-generated constructor stub
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        //通过获取用户信息
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = spotoperationrecordController.ytiotXjSpotOperationRecordService.getxjfenxi(jsonObject.toString());
 //			System.out.println(ret);
-			mav.addObject("ret_str", ret);
-			
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
 
 }

src/cn/com/usky/iot/controller/UnitController.java

@@ -2,7 +2,15 @@ package cn.com.usky.iot.controller;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 
+import cn.com.usky.iot.auth.TokenAuthBO;
+import cn.com.usky.iot.auth.TokenAuthService;
+import cn.com.usky.iot.controller.login.Constants;
+import cn.com.usky.iot.entity.YtiotTAdmin;
+import cn.com.usky.utils.HttpServletRequestUtils;
+import com.alibaba.fastjson.JSONObject;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -15,102 +23,169 @@ import cn.com.usky.iot.unit.service.YtiotTUnitService;
 @RequestMapping("/iot/unit")
 public class UnitController {
 
-	@Resource
-	private YtiotTUnitService ytiotTUnitService;
-	
-	private static UnitController unitController;
-	
-	
-	 @PostConstruct
-	 public void init() {
-		 unitController = this;
-		 unitController.ytiotTUnitService = this.ytiotTUnitService;
-	 }
-
-	@RequestMapping(value="/getList",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView  getList(@RequestParam(value = "queryJson", required = false) String queryJson,
-			@RequestParam(value = "page", required = false) String page,
-			@RequestParam(value = "start", required = false) String start,
-			@RequestParam(value = "limit", required = false) String limit,
-			@RequestParam(value = "sort", required = false) String sort) {
-		// TODO Auto-generated constructor stub
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret = unitController.ytiotTUnitService.getUnitList(queryJson,page,start,limit,sort);
+    @Resource
+    private YtiotTUnitService ytiotTUnitService;
+
+    private static UnitController unitController;
+
+
+    @PostConstruct
+    public void init() {
+        unitController = this;
+        unitController.ytiotTUnitService = this.ytiotTUnitService;
+    }
+
+    @Autowired
+    private TokenAuthService tokenAuthService;
+
+    @RequestMapping(value = "/getList", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView getList(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                @RequestParam(value = "page", required = false) String page,
+                                @RequestParam(value = "start", required = false) String start,
+                                @RequestParam(value = "limit", required = false) String limit,
+                                @RequestParam(value = "sort", required = false) String sort,
+                                HttpServletRequest request) {
+        // TODO Auto-generated constructor stub
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            JSONObject json = new JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        JSONObject jsonObject = JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = unitController.ytiotTUnitService.getUnitList(jsonObject.toString(), page, start, limit, sort);
 //			System.out.println(ret);
-			mav.addObject("ret_str", ret);
-			
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	@RequestMapping(value="/getVerList",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView  getVerList(@RequestParam(value = "queryJson", required = false) String queryJson,
-			@RequestParam(value = "page", required = false) String page,
-			@RequestParam(value = "start", required = false) String start,
-			@RequestParam(value = "limit", required = false) String limit,
-			@RequestParam(value = "sort", required = false) String sort) {
-		// TODO Auto-generated constructor stub
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret = unitController.ytiotTUnitService.getUnitVerList(queryJson,page,start,limit,sort);
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/getVerList", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView getVerList(@RequestParam(value = "queryJson", required = false) String queryJson,
+                                   @RequestParam(value = "page", required = false) String page,
+                                   @RequestParam(value = "start", required = false) String start,
+                                   @RequestParam(value = "limit", required = false) String limit,
+                                   @RequestParam(value = "sort", required = false) String sort,
+                                   HttpServletRequest request) {
+        // TODO Auto-generated constructor stub
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            JSONObject json = new JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        JSONObject jsonObject = JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = unitController.ytiotTUnitService.getUnitVerList(jsonObject.toString(), page, start, limit, sort);
 //			System.out.println(ret);
-			mav.addObject("ret_str", ret);
-			
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	@RequestMapping(value="/append",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView append(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret = unitController.ytiotTUnitService.appendUnit(queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	@RequestMapping(value="/update",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView update(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret = unitController.ytiotTUnitService.updateUnit(queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	//注销
-	@RequestMapping(value="/del",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView del(@RequestParam(value = "queryJson", required = false) String queryJson) {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("return");
-//		System.out.println(queryJson);
-		try {
-			String ret = unitController.ytiotTUnitService.deleteUnit(queryJson);
-			mav.addObject("ret_str",ret);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return mav;
-	}
-	
-	//导出
+            mav.addObject("ret_str", ret);
+
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/append", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView append(@RequestParam(value = "queryJson", required = false) String queryJson,
+                               HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            JSONObject json = new JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        JSONObject jsonObject = JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = unitController.ytiotTUnitService.appendUnit(jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    @RequestMapping(value = "/update", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView update(@RequestParam(value = "queryJson", required = false) String queryJson,
+                               HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            JSONObject json = new JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        JSONObject jsonObject = JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = unitController.ytiotTUnitService.updateUnit(jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    //注销
+    @RequestMapping(value = "/del", method = {RequestMethod.GET, RequestMethod.POST})
+    public ModelAndView del(@RequestParam(value = "queryJson", required = false) String queryJson,
+                            HttpServletRequest request) {
+        ModelAndView mav = new ModelAndView();
+        TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+        boolean isAuth = tokenAuthBO.isAuthState();
+        if (!isAuth) {
+            JSONObject json = new JSONObject();
+            json.put("check", false);
+            json.put("errMsg", "权限错误，请重新登录");
+            mav.addObject("ret_str", json.toJSONString());
+        }
+        mav.setViewName("return");
+        YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+        JSONObject jsonObject = JSONObject.parseObject(queryJson);
+        jsonObject.put("V_LOGINNAME", o.getVLoginname());
+        jsonObject.put("V_PASSWORD", o.getVPassword());
+        try {
+            String ret = unitController.ytiotTUnitService.deleteUnit(jsonObject.toString());
+            mav.addObject("ret_str", ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return mav;
+    }
+
+    //导出
 //	@RequestMapping(value="/exl",method= {RequestMethod.GET,RequestMethod.POST})
 //	public ModelAndView exl(@RequestParam(value = "queryJson", required = false) String queryJson) {
 //		ModelAndView mav = new ModelAndView();

src/cn/com/usky/iot/controller/UserStateController.java

@@ -2,7 +2,16 @@ package cn.com.usky.iot.controller;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 
+
+import cn.com.usky.iot.auth.TokenAuthBO;
+import cn.com.usky.iot.auth.TokenAuthService;
+import cn.com.usky.iot.controller.login.Constants;
+import cn.com.usky.iot.entity.YtiotTAdmin;
+import cn.com.usky.utils.HttpServletRequestUtils;
+import com.alibaba.fastjson.JSONObject;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -27,12 +36,27 @@ public class UserStateController {
 		 userStateController.ytiotTAdminStateEntityService = this.ytiotTAdminStateEntityService;
 	 }
 
+	@Autowired
+	private TokenAuthService tokenAuthService;
 	@RequestMapping(value="/getUserStateList",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView  getUserStateList(@RequestParam(value = "queryJson", required = false) String queryJson) {
+	public ModelAndView  getUserStateList(@RequestParam(value = "queryJson", required = false) String queryJson,
+										  HttpServletRequest request) {
 		ModelAndView mav = new ModelAndView();
+		TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+		boolean isAuth = tokenAuthBO.isAuthState();
+		if (!isAuth) {
+			JSONObject json = new JSONObject();
+			json.put("check", false);
+			json.put("errMsg", "权限错误，请重新登录");
+			mav.addObject("ret_str", json.toJSONString());
+		}
 		mav.setViewName("return");
+		YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+		JSONObject jsonObject = JSONObject.parseObject(queryJson);
+		jsonObject.put("V_LOGINNAME", o.getVLoginname());
+		jsonObject.put("V_PASSWORD", o.getVPassword());
 		try {
-			String ret =  userStateController.ytiotTAdminStateEntityService.getUserStateList(queryJson);
+			String ret =  userStateController.ytiotTAdminStateEntityService.getUserStateList(jsonObject.toString());
 			mav.addObject("ret_str", ret);
 			
 		} catch (Exception e) {
@@ -42,11 +66,24 @@ public class UserStateController {
 	}
 	
 	@RequestMapping(value="/updateUserState",method= {RequestMethod.GET,RequestMethod.POST})
-	public ModelAndView updateUserState(@RequestParam(value = "queryJson", required = false) String queryJson) {
+	public ModelAndView updateUserState(@RequestParam(value = "queryJson", required = false) String queryJson,
+										HttpServletRequest request) {
 		ModelAndView mav = new ModelAndView();
+		TokenAuthBO tokenAuthBO = HttpServletRequestUtils.tokenAuthForYT(request, tokenAuthService);
+		boolean isAuth = tokenAuthBO.isAuthState();
+		if (!isAuth) {
+			JSONObject json = new JSONObject();
+			json.put("check", false);
+			json.put("errMsg", "权限错误，请重新登录");
+			mav.addObject("ret_str", json.toJSONString());
+		}
 		mav.setViewName("return");
+		YtiotTAdmin o = (YtiotTAdmin) tokenAuthBO.getData().get(Constants.USER_INFO);
+		JSONObject jsonObject = JSONObject.parseObject(queryJson);
+		jsonObject.put("V_LOGINNAME", o.getVLoginname());
+		jsonObject.put("V_PASSWORD", o.getVPassword());
 		try {
-			String ret =  userStateController.ytiotTAdminStateEntityService.updateUserState(queryJson);
+			String ret =  userStateController.ytiotTAdminStateEntityService.updateUserState(jsonObject.toString());
 			mav.addObject("ret_str",ret);
 		} catch (Exception e) {
 			e.printStackTrace();

src/cn/com/usky/iot/controller/group/GroupController.java

@@ -1,5 +1,6 @@
 package cn.com.usky.iot.controller.group;
 
+import cn.com.usky.iot.auth.TokenAuthService;
 import cn.com.usky.iot.service.groupService.GroupService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;

src/cn/com/usky/iot/data/service/YtiotVDataServiceImpl.java

@@ -3009,7 +3009,7 @@ public class YtiotVDataServiceImpl implements YtiotVDataService {
 		}
 		if((V_LOGINNAME!=null)&&(V_PASSWORD!=null)) {
 			List list = ytiotTAdminDao.query(" where u.VLoginname='"+V_LOGINNAME+"' and u.VPassword='"
-					+MD5Util.EncoderByMd5(MD5Util.EncoderByMd5(V_PASSWORD))+"' ", null, null, null, null);
+					+V_PASSWORD+"' ", null, null, null, null);
 			if(list.size()>0) {
 				YtiotTAdmin o = (YtiotTAdmin)list.get(0);
 				E_STATUS = Integer.parseInt(o.getEStatus());
@@ -3411,7 +3411,7 @@ public class YtiotVDataServiceImpl implements YtiotVDataService {
 		}
 		if((V_LOGINNAME!=null)&&(V_PASSWORD!=null)) {
 			List list = ytiotTAdminDao.query(" where MD5(u.VLoginname)='"+MD5Util.EncoderByMd5(V_LOGINNAME)+"' and u.VPassword='"
-					+MD5Util.EncoderByMd5(MD5Util.EncoderByMd5(V_PASSWORD))+"' ", null, null, null, null);
+					+V_PASSWORD+"' ", null, null, null, null);
 			if(list.size()>0) {
 				YtiotTAdmin o = (YtiotTAdmin)list.get(0);
 				E_STATUS = Integer.parseInt(o.getEStatus());
@@ -3515,7 +3515,7 @@ public class YtiotVDataServiceImpl implements YtiotVDataService {
 		}
 		if((V_LOGINNAME!=null)&&(V_PASSWORD!=null)) {
 			List list = ytiotTAdminDao.query(" where u.VLoginname='"+V_LOGINNAME+"' and u.VPassword='"
-					+MD5Util.EncoderByMd5(MD5Util.EncoderByMd5(V_PASSWORD))+"' ", null, null, null, null);
+					+V_PASSWORD+"' ", null, null, null, null);
 			if(list.size()>0) {
 				YtiotTAdmin o = (YtiotTAdmin)list.get(0);
 				E_STATUS = Integer.parseInt(o.getEStatus());

src/cn/com/usky/iot/frontpage/service/YtiotFrontpageQueryServiceImpl.java

@@ -128,7 +128,7 @@ public class YtiotFrontpageQueryServiceImpl implements YtiotFrontpageQueryServic
             COMMSTATUS = q_json.has("COMMSTATUS") ? q_json.getString("COMMSTATUS") : null;
         }
         if ((V_LOGINNAME != null) && (V_PASSWORD != null)) {
-            List ulist = ytiotTAdminDao.query(" where MD5(u.VLoginname)='" + MD5Util.EncoderByMd5(V_LOGINNAME) + "' and u.VPassword='" + MD5Util.EncoderByMd5(MD5Util.EncoderByMd5(V_PASSWORD)) + "' ", null, null, null, null);
+            List ulist = ytiotTAdminDao.query(" where MD5(u.VLoginname)='" + MD5Util.EncoderByMd5(V_LOGINNAME) + "' and u.VPassword='" + V_PASSWORD + "' ", null, null, null, null);
             if (ulist.size() > 0) {
                 YtiotTAdmin admin = (YtiotTAdmin) ulist.get(0);
                 E_STATUS = Integer.parseInt(admin.getEStatus());
@@ -1076,7 +1076,7 @@ public class YtiotFrontpageQueryServiceImpl implements YtiotFrontpageQueryServic
         }
         if ((V_LOGINNAME != null) && (V_PASSWORD != null)) {
             List list = ytiotTAdminDao.query(" where MD5(u.VLoginname)='" + MD5Util.EncoderByMd5(V_LOGINNAME) + "' and u.VPassword='"
-                    + MD5Util.EncoderByMd5(MD5Util.EncoderByMd5(V_PASSWORD)) + "' ", null, null, null, null);
+                    + V_PASSWORD + "' ", null, null, null, null);
             if (list.size() > 0) {
                 YtiotTAdmin o = (YtiotTAdmin) list.get(0);
                 E_STATUS = Integer.parseInt(o.getEStatus());

src/cn/com/usky/iot/inspectionrecord/service/YtiotTInspectionRecordServicesImpl.java

@@ -225,7 +225,7 @@ public class YtiotTInspectionRecordServicesImpl implements YtiotTInspectionRecor
 		
 		if((V_LOGINNAME!=null)&&(V_PASSWORD!=null)) {
 			List list66 = ytiotTAdminDao.query(" where MD5(u.VLoginname)='"+MD5Util.EncoderByMd5(V_LOGINNAME)+"' and u.VPassword='"
-					+MD5Util.EncoderByMd5(MD5Util.EncoderByMd5(V_PASSWORD))+"' ", null, null, null, null);
+					+V_PASSWORD+"' ", null, null, null, null);
 			if(list66.size()>0) {
 				YtiotTAdmin b1 = (YtiotTAdmin)list66.get(0);
 //				System.out.println("测试1"+o1.getEStatus()); 
@@ -523,7 +523,7 @@ public class YtiotTInspectionRecordServicesImpl implements YtiotTInspectionRecor
 		
 		if((V_LOGINNAME!=null)&&(V_PASSWORD!=null)) {
 			List list66 = ytiotTAdminDao.query(" where MD5(u.VLoginname)='"+MD5Util.EncoderByMd5(V_LOGINNAME)+"' and u.VPassword='"
-					+MD5Util.EncoderByMd5(MD5Util.EncoderByMd5(V_PASSWORD))+"' ", null, null, null, null);
+					+V_PASSWORD+"' ", null, null, null, null);
 			if(list66.size()>0) {
 				YtiotTAdmin b1 = (YtiotTAdmin)list66.get(0);
 //				System.out.println("测试1"+o1.getEStatus()); 

src/cn/com/usky/iot/maintenance/service/YtiotTMaintenanceServicesImpl.java

@@ -419,7 +419,7 @@ public class YtiotTMaintenanceServicesImpl implements YtiotTMaintenanceService {
 		
 		if((V_LOGINNAME!=null)&&(V_PASSWORD!=null)) {
 			List list9 = ytiotTAdminDao.query(" where MD5(u.VLoginname)='"+MD5Util.EncoderByMd5(V_LOGINNAME)+"' and u.VPassword='"
-					+MD5Util.EncoderByMd5(MD5Util.EncoderByMd5(V_PASSWORD))+"' ", null, null, null, null);
+					+V_PASSWORD+"' ", null, null, null, null);
 			if(list9.size()>0) {
 				YtiotTAdmin o1 = (YtiotTAdmin)list9.get(0);
 //				System.out.println("测试1"+o1.getEStatus()); 
@@ -589,7 +589,7 @@ public class YtiotTMaintenanceServicesImpl implements YtiotTMaintenanceService {
 		
 		if((V_LOGINNAME!=null)&&(V_PASSWORD!=null)) {
 			List list9 = ytiotTAdminDao.query(" where MD5(u.VLoginname)='"+MD5Util.EncoderByMd5(V_LOGINNAME)+"' and u.VPassword='"
-					+MD5Util.EncoderByMd5(MD5Util.EncoderByMd5(V_PASSWORD))+"' ", null, null, null, null);
+					+V_PASSWORD+"' ", null, null, null, null);
 			if(list9.size()>0) {
 				YtiotTAdmin o1 = (YtiotTAdmin)list9.get(0);
 //				System.out.println("测试1"+o1.getEStatus()); 

src/cn/com/usky/iot/maintenanceplan/service/YtiotTMaintenancePlanServicesImpl.java

@@ -719,7 +719,7 @@ public class YtiotTMaintenancePlanServicesImpl implements YtiotTMaintenancePlanS
 		
 		if((V_LOGINNAME!=null)&&(V_PASSWORD!=null)) {
 			List list88 = ytiotTAdminDao.query(" where MD5(u.VLoginname)='"+MD5Util.EncoderByMd5(V_LOGINNAME)+"' and u.VPassword='"
-					+MD5Util.EncoderByMd5(MD5Util.EncoderByMd5(V_PASSWORD))+"' ", null, null, null, null);
+					+V_PASSWORD+"' ", null, null, null, null);
 			if(list88.size()>0) {
 				YtiotTAdmin b2 = (YtiotTAdmin)list88.get(0);
 				System.out.println("测试1"+b2.getEStatus()); 
@@ -933,7 +933,7 @@ public class YtiotTMaintenancePlanServicesImpl implements YtiotTMaintenancePlanS
 		
 		if((V_LOGINNAME!=null)&&(V_PASSWORD!=null)) {
 			List list88 = ytiotTAdminDao.query(" where MD5(u.VLoginname)='"+MD5Util.EncoderByMd5(V_LOGINNAME)+"' and u.VPassword='"
-					+MD5Util.EncoderByMd5(MD5Util.EncoderByMd5(V_PASSWORD))+"' ", null, null, null, null);
+					+V_PASSWORD+"' ", null, null, null, null);
 			if(list88.size()>0) {
 				YtiotTAdmin b2 = (YtiotTAdmin)list88.get(0);
 //				System.out.println("测试1"+b2.getEStatus()); 

src/cn/com/usky/iot/maintenancerecord/service/YtiotTMaintenanceRecordServicesImpl.java

@@ -225,7 +225,7 @@ public class YtiotTMaintenanceRecordServicesImpl implements YtiotTMaintenanceRec
 		
 		if((V_LOGINNAME!=null)&&(V_PASSWORD!=null)) {
 			List list66 = ytiotTAdminDao.query(" where MD5(u.VLoginname)='"+MD5Util.EncoderByMd5(V_LOGINNAME)+"' and u.VPassword='"
-					+MD5Util.EncoderByMd5(MD5Util.EncoderByMd5(V_PASSWORD))+"' ", null, null, null, null);
+					+V_PASSWORD+"' ", null, null, null, null);
 			if(list66.size()>0) {
 				YtiotTAdmin b1 = (YtiotTAdmin)list66.get(0);
 //				System.out.println("测试1"+o1.getEStatus()); 
@@ -523,7 +523,7 @@ public class YtiotTMaintenanceRecordServicesImpl implements YtiotTMaintenanceRec
 		
 		if((V_LOGINNAME!=null)&&(V_PASSWORD!=null)) {
 			List list66 = ytiotTAdminDao.query(" where MD5(u.VLoginname)='"+MD5Util.EncoderByMd5(V_LOGINNAME)+"' and u.VPassword='"
-					+MD5Util.EncoderByMd5(MD5Util.EncoderByMd5(V_PASSWORD))+"' ", null, null, null, null);
+					+V_PASSWORD+"' ", null, null, null, null);
 			if(list66.size()>0) {
 				YtiotTAdmin b1 = (YtiotTAdmin)list66.get(0);
 //				System.out.println("测试1"+o1.getEStatus()); 

src/cn/com/usky/iot/outcrypackage/service/YtiotVCompanyServiceImpl.java

@@ -454,7 +454,7 @@ public class YtiotVCompanyServiceImpl implements YtiotVCompanyService {
 		}
 		if((V_LOGINNAME!=null)&&(V_PASSWORD!=null)) {
 			List list = ytiotTAdminDao.query(" where u.VLoginname='"+V_LOGINNAME+"' and u.VPassword='"
-					+MD5Util.EncoderByMd5(MD5Util.EncoderByMd5(V_PASSWORD))+"' ", null, null, null, null);
+					+V_PASSWORD+"' ", null, null, null, null);
 			if(list.size()>0) {
 				YtiotTAdmin o = (YtiotTAdmin)list.get(0);
 				E_STATUS = Integer.parseInt(o.getEStatus());

src/cn/com/usky/iot/patrolplan/service/YtiotTPatrolPlanServicesImpl.java

@@ -720,7 +720,7 @@ public class YtiotTPatrolPlanServicesImpl implements YtiotTPatrolPlanService {
 		
 		if((V_LOGINNAME!=null)&&(V_PASSWORD!=null)) {
 			List list88 = ytiotTAdminDao.query(" where MD5(u.VLoginname)='"+MD5Util.EncoderByMd5(V_LOGINNAME)+"' and u.VPassword='"
-					+MD5Util.EncoderByMd5(MD5Util.EncoderByMd5(V_PASSWORD))+"' ", null, null, null, null);
+					+V_PASSWORD+"' ", null, null, null, null);
 			if(list88.size()>0) {
 				YtiotTAdmin b2 = (YtiotTAdmin)list88.get(0);
 //				System.out.println("测试1"+b2.getEStatus()); 
@@ -934,7 +934,7 @@ public class YtiotTPatrolPlanServicesImpl implements YtiotTPatrolPlanService {
 		
 		if((V_LOGINNAME!=null)&&(V_PASSWORD!=null)) {
 			List list88 = ytiotTAdminDao.query(" where MD5(u.VLoginname)='"+MD5Util.EncoderByMd5(V_LOGINNAME)+"' and u.VPassword='"
-					+MD5Util.EncoderByMd5(MD5Util.EncoderByMd5(V_PASSWORD))+"' ", null, null, null, null);
+					+V_PASSWORD+"' ", null, null, null, null);
 			if(list88.size()>0) {
 				YtiotTAdmin b2 = (YtiotTAdmin)list88.get(0);
 //				System.out.println("测试1"+b2.getEStatus()); 

src/cn/com/usky/iot/patrolpoint/service/YtiotTPatrolPointServicesImpl.java

@@ -417,7 +417,7 @@ public class YtiotTPatrolPointServicesImpl implements YtiotTPatrolPointService {
 		
 		if((V_LOGINNAME!=null)&&(V_PASSWORD!=null)) {
 			List list9 = ytiotTAdminDao.query(" where MD5(u.VLoginname)='"+MD5Util.EncoderByMd5(V_LOGINNAME)+"' and u.VPassword='"
-					+MD5Util.EncoderByMd5(MD5Util.EncoderByMd5(V_PASSWORD))+"' ", null, null, null, null);
+					+V_PASSWORD+"' ", null, null, null, null);
 			if(list9.size()>0) {
 				YtiotTAdmin o1 = (YtiotTAdmin)list9.get(0);
 //				System.out.println("测试1"+o1.getEStatus()); 
@@ -587,7 +587,7 @@ public class YtiotTPatrolPointServicesImpl implements YtiotTPatrolPointService {
 		
 		if((V_LOGINNAME!=null)&&(V_PASSWORD!=null)) {
 			List list9 = ytiotTAdminDao.query(" where MD5(u.VLoginname)='"+MD5Util.EncoderByMd5(V_LOGINNAME)+"' and u.VPassword='"
-					+MD5Util.EncoderByMd5(MD5Util.EncoderByMd5(V_PASSWORD))+"' ", null, null, null, null);
+					+V_PASSWORD+"' ", null, null, null, null);
 			if(list9.size()>0) {
 				YtiotTAdmin o1 = (YtiotTAdmin)list9.get(0);
 //				System.out.println("测试1"+o1.getEStatus()); 

src/cn/com/usky/iot/route/service/YtiotTRouteServicesImpl.java

@@ -372,7 +372,7 @@ public class YtiotTRouteServicesImpl implements YtiotTRouteService {
 		
 		if((V_LOGINNAME!=null)&&(V_PASSWORD!=null)) {
 			List list1 = ytiotTAdminDao.query(" where MD5(u.VLoginname)='"+MD5Util.EncoderByMd5(V_LOGINNAME)+"' and u.VPassword='"
-					+MD5Util.EncoderByMd5(MD5Util.EncoderByMd5(V_PASSWORD))+"' ", null, null, null, null);
+					+V_PASSWORD+"' ", null, null, null, null);
 			if(list1.size()>0) {
 				YtiotTAdmin o1 = (YtiotTAdmin)list1.get(0);
 //				System.out.println("测试1"+o1.getEStatus()); 
@@ -516,7 +516,7 @@ public class YtiotTRouteServicesImpl implements YtiotTRouteService {
 		
 		if((V_LOGINNAME!=null)&&(V_PASSWORD!=null)) {
 			List list1 = ytiotTAdminDao.query(" where MD5(u.VLoginname)='"+MD5Util.EncoderByMd5(V_LOGINNAME)+"' and u.VPassword='"
-					+MD5Util.EncoderByMd5(MD5Util.EncoderByMd5(V_PASSWORD))+"' ", null, null, null, null);
+					+V_PASSWORD+"' ", null, null, null, null);
 			if(list1.size()>0) {
 				YtiotTAdmin o1 = (YtiotTAdmin)list1.get(0);
 //				System.out.println("测试1"+o1.getEStatus()); 

src/cn/com/usky/iot/route2/service/YtiotTRoute2ServicesImpl.java

@@ -387,7 +387,7 @@ public class YtiotTRoute2ServicesImpl implements YtiotTRoute2Service {
 		
 		if((V_LOGINNAME!=null)&&(V_PASSWORD!=null)) {
 			List list1 = ytiotTAdminDao.query(" where MD5(u.VLoginname)='"+MD5Util.EncoderByMd5(V_LOGINNAME)+"' and u.VPassword='"
-					+MD5Util.EncoderByMd5(MD5Util.EncoderByMd5(V_PASSWORD))+"' ", null, null, null, null);
+					+V_PASSWORD+"' ", null, null, null, null);
 			if(list1.size()>0) {
 				YtiotTAdmin o1 = (YtiotTAdmin)list1.get(0);
 //				System.out.println("测试1"+o1.getEStatus()); 
@@ -533,7 +533,7 @@ public class YtiotTRoute2ServicesImpl implements YtiotTRoute2Service {
 		
 		if((V_LOGINNAME!=null)&&(V_PASSWORD!=null)) {
 			List list1 = ytiotTAdminDao.query(" where MD5(u.VLoginname)='"+MD5Util.EncoderByMd5(V_LOGINNAME)+"' and u.VPassword='"
-					+MD5Util.EncoderByMd5(MD5Util.EncoderByMd5(V_PASSWORD))+"' ", null, null, null, null);
+					+V_PASSWORD+"' ", null, null, null, null);
 			if(list1.size()>0) {
 				YtiotTAdmin o1 = (YtiotTAdmin)list1.get(0);
 //				System.out.println("测试1"+o1.getEStatus());