修正

王通
1 parent 217f4da1
Showing 2 changed files with 21 additions and 10 deletions
src/main/java/com/bsth/controller/DeviceGpsController.java
src/main/resources/static/pages/device/connection_search.html
@@ -23,6 +23,7 @@ import org.apache.poi.hssf.usermodel.HSSFRichTextString;
 import org.apache.poi.hssf.usermodel.HSSFRow;
 import org.apache.poi.hssf.usermodel.HSSFSheet;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -37,6 +38,7 @@ import com.bsth.data.gpsdata.GpsRealData;
 import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.util.BeanUtil;
 @RestController
 @RequestMapping("devicegps")
@@ -148,11 +150,18 @@ public class DeviceGpsController {
 		try {
 			data = new ObjectMapper().readValue(json, List.class);
 			for (Map<String, Object> info : data) {
-				GpsEntity gps = gpsRealData.findByDeviceId((String)info.get("deviceId"));
-				info.put("lineId", gps.getLineId());
-				info.put("valid", gps.getValid() == 0 ? "有效" : "无效");
-				info.put("timestamp", sdf.format(new Date(gps.getTimestamp())));
-				info.put("version", gps.getVersion());
+				Map<String, Object> detail = (Map<String, Object>)info.get("detail");
+				if (detail != null) {
+					info.put("lineId", detail.get("lineId"));
+					info.put("valid", (int)detail.get("valid") == 0 ? "有效" : "无效");
+					info.put("timestamp", sdf.format(new Date((Long)detail.get("timestamp"))));
+					info.put("version", detail.get("version"));
+				} else {
+					info.put("lineId", "");
+					info.put("valid", "");
+					info.put("timestamp", "");
+					info.put("version", "");
+				}
 			}
 			List<Header> head = new ArrayList<>();
@@ -232,7 +232,7 @@
 </script>
 <script>
 $(function(){
-	var opened;
+	var opened,filtered;
 	$('#myTab li:eq(0) a').tab('show');
     $('#fileinput').fileinput({
     	'showPreview' : false,
@@ -252,10 +252,11 @@ $(function(){
 				$(this).html(moment(parseInt($(this).html())).format('YYYY-M-D HH:mm:ss'));
 			});
 			opened = new Array();
+			filtered = new Array();
 			for (var j = 0,len = r.data.length;j < len;j++) {
 				var item = r.data[j];
-				delete item.detail;
 				opened.push(item);
+				filtered.push(item);
 			}
 		}
     	$(this).fileinput('clear').fileinput('enable');
@@ -281,7 +282,8 @@ $(function(){
 		$post('/devicegps/opened', params, function(r){
 			if(r.errCode) layer.msg(r.msg);
 			else {
-				var filtered = new Array(), val = $('input[type=radio][name=filterOption]:checked').val(), version = $('#version').val(), i = 0,item = null;
+				var val = $('input[type=radio][name=filterOption]:checked').val(), version = $('#version').val(), i = 0,item = null;
+				filtered = new Array();
 				switch(val) {
 					case '1':
 						filtered = r.data;
@@ -323,8 +325,8 @@ $(function(){
 	}
 	function exportResult() {
-		if (!opened) return false;
-		$('#json').val(JSON.stringify(opened));
+		if (!filtered) return false;
+		$('#json').val(JSON.stringify(filtered));
 		var form = $('#export_form');
 		form.submit();
 	}