1.0.9.10，java部分修改，按照http--v4的接口修改

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

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

@@ -39,13 +39,17 @@ public class DeviceInfoController {
         if (StringUtils.isBlank(sort) || StringUtils.isBlank(order) || StringUtils.isBlank(offset) || StringUtils.isBlank(limit))
             return ;
 
+
         String or = "ORDER BY " + sort + " " + order + " OFFSET " + offset + " ROWS FETCH NEXT " + limit + " ROWS ONLY ";
         //String sql = "SELECT [IMEI],[name],[mo],[CCID],[longitude],[latitude],[updatetime],[type],[version],[model],[group0name],[group1name],[group2name] FROM [rm_deviceinfo] ";
-        String sql = "SELECT a.[IMEI],a.[name],[CCID],[longitude],[latitude],a.[updatetime],a.[type],[version],[model],[group0name],[group1name],[group2name],c.up + c.name as mo FROM [rm_deviceinfo] AS a" +
+        String sql = "SELECT a.[IMEI],a.[name],[CCID],[longitude],[latitude],a.[updatetime],a.[type],[version],[model],[group0name],[group1name]," +
+                "[group2name],c.up + c.name as mo FROM [rm_deviceinfo] AS a" +
                 " LEFT JOIN (SELECT distinct mo,IMEI FROM rm_map) AS b on a.IMEI = b.IMEI" +
                 " LEFT JOIN rm_mo as c on b.mo = c.id ";
         sql += or;
 
+
+
         BootstrapTable bt = new BootstrapTable();
         List<deviceinfo> lst = deviceinfo.QueryDeviceInfoBySql(sql);
         for (deviceinfo it : lst)
@@ -167,7 +171,7 @@ public class DeviceInfoController {
     }
 
     @RequestMapping(value="/api/equip/list.cpp", method = RequestMethod.GET)
-    public void GetEquipList(HttpServletRequest request, HttpServletResponse response, String token) throws IOException {
+        public void GetEquipList(HttpServletRequest request, HttpServletResponse response, String token) throws IOException {
         if (StringUtils.isBlank(token)) {
             token = request.getHeader("Authorization");
             if (StringUtils.isBlank(token)) {
@@ -176,12 +180,22 @@ public class DeviceInfoController {
             }
         }
         //系统管理员
-        String sql = "SELECT a.mo,B.name,a.mp,a.IMEI,idx,[direct1],[direct2],[tow_num],[zzj_type],[mt_ext_loca]" +
-                ",[mt_ext_no],[zl_1_loca],[zl_1_no],[zl_2_loca],[zl_2_no],[zl_3_no],e.[updatetime],C.up,D.name,e.version AS up_name,zzjno,epos,install_1,install_2,install_3 FROM rm_map " +
-                " AS A LEFT JOIN rm_mo AS B ON A.mo = B.id " +
-                " LEFT JOIN rm_mo AS C ON A.mo = C.id " +
-                " LEFT JOIN rm_mo AS D ON c.up = D.id " +
-                " LEFT JOIN rm_deviceinfo E ON a.IMEI = e.IMEI ";
+        String sql = "SELECT a.mo,B.name,a.mp,a.IMEI,idx,[direct1],[direct2],[tow_num],[zzj_type],[mt_ext_loca]," +
+                "[mt_ext_no],[zl_1_loca],[zl_1_no],[zl_2_loca],[zl_2_no],[zl_3_no],e.[updatetime],C.up,D.name," +
+                "e.version AS up_name,zzjno,epos,install_1,install_2,install_3,isnull(p1,1) p1,isnull(p2,1) p2,isnull(p3,1) p3,isnull(d1,0) d1,isnull(d2,0) d2," +
+                "isnull(d3,0) d3,1 as is_alive " +
+                "FROM rm_map  AS A LEFT JOIN rm_mo AS B ON A.mo = B.id " +
+                "LEFT JOIN rm_mo AS C ON A.mo = C.id " +
+                "LEFT JOIN rm_mo AS D ON c.up = D.id " +
+                "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 " +
+                ") 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)
         {
             //所有
@@ -216,6 +230,13 @@ public class DeviceInfoController {
                             r.setInstall_1(resultSet.getInt(j++));
                             r.setInstall_2(resultSet.getInt(j++));
                             r.setInstall_3(resultSet.getInt(j++));
+                            r.setP1(resultSet.getInt(j++));
+                            r.setP2(resultSet.getInt(j++));
+                            r.setP3(resultSet.getInt(j++));
+                            r.setD1(resultSet.getInt(j++));
+                            r.setD2(resultSet.getInt(j++));
+                            r.setD3(resultSet.getInt(j++));
+                            r.setIs_alive(resultSet.getInt(j++));
                             return r;
                         }
                     });

3.Java/src/com/company/model/MoMap.java

@@ -61,6 +61,20 @@ public class MoMap {
 
     Integer install_1;
 
+    Integer p1;
+
+    Integer p2;
+
+    Integer p3;
+
+    Integer d1;
+
+    Integer d2;
+
+    Integer d3;
+
+    Integer is_alive;
+
     public Integer getZzjno() {
         return zzjno;
     }
@@ -77,6 +91,34 @@ public class MoMap {
         this.epos = epos;
     }
 
+    public Integer getD1() {return d1;}
+
+    public Integer getD2() {return d2;}
+
+    public Integer getD3() {return d3;}
+
+    public Integer getP1() {return p1;}
+
+    public Integer getP2() {return p2;}
+
+    public Integer getP3() {return p3;}
+
+    public Integer getIs_alive() {return is_alive;}
+
+    public void setD1(Integer d1_1) {this.d1 = d1_1;}
+
+    public void setD2(Integer d2_1) {this.d2 = d2_1;}
+
+    public void setD3(Integer d3_1) {this.d3 = d3_1;}
+
+    public void setP1(Integer p1_1) {this.p1 = p1_1;}
+
+    public void setP2(Integer p2_1) {this.p2 = p2_1;}
+
+    public void setP3(Integer p3_1) {this.p3 = p3_1;}
+
+    public void setIs_alive(Integer isAlive_1) {this.is_alive = isAlive_1;}
+
     public Integer getInstall_1() {
         return install_1;
     }