git-svn-id: https://202.107.226.68:8443/svn/Services/ResistanceMonitor@58 a05970a1-87b9-9d4f-9ee5-fa77e2ec115b

3.Java/src/com/company/controller/DeviceInfoController.java

@@ -193,11 +193,11 @@ public class DeviceInfoController {
                 "LEFT JOIN rm_deviceinfo E ON a.IMEI = e.IMEI " +
                 "LEFT JOIN (select * from " +
                 "( " +
-                        "select st0 as p1,st3 as p2,st6 as p3, dt0 as d1,dt3 as d2,dt6 as d3, 0 as idx1,imei from rm_deviceinfo "+
-                        "union " +
-                        "select st1 as p1,st4 as p2,st7 as p3, dt1 as d1,dt4 as d2,dt7 as d3, 1 as idx1,imei  from rm_deviceinfo "+
-                        "union " +
-                        "select st2 as p1,st5 as p2,st8 as p3, dt2 as d1,dt5 as d2,dt8 as d3, 2 as idx1,imei  from rm_deviceinfo " +
+                    "select st0 as p1,st1 as p2,st2 as p3, dt0 as d1,dt1 as d2,dt2 as d3, 0 as idx1,imei from rm_deviceinfo "+
+                    "union " +
+                    "select st3 as p1,st4 as p2,st5 as p3, dt3 as d1,dt4 as d2,dt5 as d3, 1 as idx1,imei  from rm_deviceinfo "+
+                    "union " +
+                    "select st6 as p1,st7 as p2,st8 as p3, dt6 as d1,dt7 as d2,dt8 as d3, 2 as idx1,imei  from rm_deviceinfo " +
                 ") as device_status) as device_status on a.imei= device_status.imei and a.idx = device_status.idx1 ";
         if (token.compareTo("AAAAAAAA-AAAA-AAAA-AAAA-AAAAAAAAAAAA") == 0)
         {